You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2017/03/01 20:49:35 UTC
[32/48] airavata git commit: Moving registry components for
user-profile service to respective module
Moving registry components for user-profile service to respective module
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/01943baf
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/01943baf
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/01943baf
Branch: refs/heads/user-profile
Commit: 01943baf04a15b10f800497e0de111276602d7ab
Parents: e9f14e2
Author: Anuj Bhandar <an...@149-160-226-201.dhcp-bl.indiana.edu>
Authored: Wed Feb 1 15:12:33 2017 -0500
Committer: Anuj Bhandar <bh...@gmail.com>
Committed: Tue Feb 28 12:55:34 2017 -0500
----------------------------------------------------------------------
modules/registry-refactoring/pom.xml | 132 ----------
.../registry/core/RegistryException.java | 28 ---
.../workspacecatalog/GatewayEntity.java | 221 -----------------
.../workspacecatalog/NSFDemographicsEntity.java | 94 -------
.../workspacecatalog/NotificationEntity.java | 110 ---------
.../workspacecatalog/ProjectEntity.java | 92 -------
.../workspacecatalog/UserProfileEntity.java | 247 -------------------
.../core/repositories/AbstractRepository.java | 98 --------
.../workspacecatalog/GatewayRepository.java | 36 ---
.../NotificationRepository.java | 35 ---
.../workspacecatalog/ProjectRepository.java | 35 ---
.../workspacecatalog/UserProfileRepository.java | 88 -------
.../airavata/registry/core/utils/Committer.java | 27 --
.../registry/core/utils/JPAConstants.java | 32 ---
.../airavata/registry/core/utils/JPAUtils.java | 83 -------
.../core/utils/ObjectMapperSingleton.java | 39 ---
.../registry/core/utils/QueryConstants.java | 22 --
.../airavata/registry/core/utils/Utils.java | 156 ------------
.../src/main/resources/META-INF/persistence.xml | 32 ---
.../src/main/resources/workspace_catalog.sql | 125 ----------
.../repositories/WorkspaceRepositoryTest.java | 197 ---------------
modules/user-profile/pom.xml | 1 +
modules/user-profile/user-profile-core/pom.xml | 130 ++++++++++
.../registry/core/RegistryException.java | 28 +++
.../workspacecatalog/GatewayEntity.java | 221 +++++++++++++++++
.../workspacecatalog/NSFDemographicsEntity.java | 94 +++++++
.../workspacecatalog/NotificationEntity.java | 110 +++++++++
.../workspacecatalog/ProjectEntity.java | 92 +++++++
.../workspacecatalog/UserProfileEntity.java | 247 +++++++++++++++++++
.../core/repositories/AbstractRepository.java | 98 ++++++++
.../workspacecatalog/GatewayRepository.java | 36 +++
.../NotificationRepository.java | 35 +++
.../workspacecatalog/ProjectRepository.java | 35 +++
.../workspacecatalog/UserProfileRepository.java | 88 +++++++
.../airavata/registry/core/utils/Committer.java | 27 ++
.../registry/core/utils/JPAConstants.java | 32 +++
.../airavata/registry/core/utils/JPAUtils.java | 83 +++++++
.../core/utils/ObjectMapperSingleton.java | 39 +++
.../registry/core/utils/QueryConstants.java | 22 ++
.../airavata/registry/core/utils/Utils.java | 156 ++++++++++++
.../src/main/resources/META-INF/persistence.xml | 32 +++
.../src/main/resources/workspace_catalog.sql | 125 ++++++++++
.../repositories/WorkspaceRepositoryTest.java | 197 +++++++++++++++
pom.xml | 1 -
44 files changed, 1928 insertions(+), 1930 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/01943baf/modules/registry-refactoring/pom.xml
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/pom.xml b/modules/registry-refactoring/pom.xml
deleted file mode 100644
index 100f796..0000000
--- a/modules/registry-refactoring/pom.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata</artifactId>
- <version>0.17-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <groupId>org.apache.airavata</groupId>
- <artifactId>registry-refactoring</artifactId>
-
- <properties>
- <derby.version>10.11.1.1</derby.version>
- <surefire.version>2.18.1</surefire.version>
- <skipTests>false</skipTests>
- <mysql.connector.version>5.1.34</mysql.connector.version>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-data-models</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>net.sf.dozer</groupId>
- <artifactId>dozer</artifactId>
- <version>5.4.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-all</artifactId>
- <version>2.3.0</version>
- </dependency>
-
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>${mysql.connector.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyclient</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbynet</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbytools</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-commons</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-maven-plugin</artifactId>
- <version>2.2.0</version>
- <configuration>
- <includes>**/entities/*.class</includes>
- <excludes>**/entities/XML*.class</excludes>
- <addDefaultConstructor>true</addDefaultConstructor>
- <enforcePropertyRestrictions>true</enforcePropertyRestrictions>
- </configuration>
- <executions>
- <execution>
- <id>enhancer</id>
- <phase>process-classes</phase>
- <goals>
- <goal>enhance</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- <version>2.2.0</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <inherited>true</inherited>
- <configuration>
- <failIfNoTests>false</failIfNoTests>
- <!--<skipTests>${skipTests}</skipTests>-->
- <skipTests>true</skipTests>
- <workingDirectory>${project.build.testOutputDirectory}</workingDirectory>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/01943baf/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/RegistryException.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/RegistryException.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/RegistryException.java
deleted file mode 100644
index 8893b34..0000000
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/RegistryException.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-package org.apache.airavata.registry.core;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class RegistryException extends Exception {
- private final static Logger logger = LoggerFactory.getLogger(RegistryException.class);
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/01943baf/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/workspacecatalog/GatewayEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/workspacecatalog/GatewayEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/workspacecatalog/GatewayEntity.java
deleted file mode 100644
index 4490580..0000000
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/workspacecatalog/GatewayEntity.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-package org.apache.airavata.registry.core.entities.workspacecatalog;
-
-import javax.persistence.*;
-
-@Entity
-@Table(name="GATEWAY")//FIXME removing WORKSPACE prefix so that we can use the Gateway table in exp catalog
-public class GatewayEntity {
- private String gatewayId;
- private String gatewayName;
- private String domain;
- private String emailAddress;
- private String gatewayApprovalStatus;
- private String gatewayAcronym;
- private String gatewayUrl;
- private String gatewayPublicAbstract;
- private String reviewProposalDescription;
- private String gatewayAdminFirstName;
- private String getGatewayAdminLastName;
- private String gatewayAdminEmail;
- private String identityServerUserName;
- private String identityServerPasswordToken;
- private String declinedReason;
- private String oauthClientId;
- private String getOauthClientSecret;
- private long requestCreationTime;
- private String requesterUsername;
-
- @Id
- @Column(name = "GATEWAY_ID")
- public String getGatewayId() {
- return gatewayId;
- }
-
- public void setGatewayId(String id) {
- this.gatewayId = id;
- }
-
- @Column(name = "GATEWAY_NAME")
- public String getGatewayName() {
- return gatewayName;
- }
-
- public void setGatewayName(String gatewayName) {
- this.gatewayName = gatewayName;
- }
-
- @Column(name = "GATEWAY_DOMAIN")
- public String getDomain() {
- return domain;
- }
-
- public void setDomain(String domain) {
- this.domain = domain;
- }
-
- @Column(name = "EMAIL_ADDRESS")
- public String getEmailAddress() {
- return emailAddress;
- }
-
- public void setEmailAddress(String emailAddress) {
- this.emailAddress = emailAddress;
- }
-
- @Column(name = "GATEWAY_APPROVAL_STATUS")
- public String getGatewayApprovalStatus() {
- return gatewayApprovalStatus;
- }
-
- public void setGatewayApprovalStatus(String gatewayApprovalStatus) {
- this.gatewayApprovalStatus = gatewayApprovalStatus;
- }
-
- @Column(name = "GATEWAY_ACRONYM")
- public String getGatewayAcronym() {
- return gatewayAcronym;
- }
-
- public void setGatewayAcronym(String gatewayAcronym) {
- this.gatewayAcronym = gatewayAcronym;
- }
-
- @Column(name = "GATEWAY_URL")
- public String getGatewayUrl() {
- return gatewayUrl;
- }
-
- public void setGatewayUrl(String gatewayUrl) {
- this.gatewayUrl = gatewayUrl;
- }
-
- @Lob
- @Column(name = "GATEWAY_PUBLIC_ABSTRACT")
- public String getGatewayPublicAbstract() {
- return gatewayPublicAbstract;
- }
-
- public void setGatewayPublicAbstract(String gatewayPublicAbstract) {
- this.gatewayPublicAbstract = gatewayPublicAbstract;
- }
-
- @Lob
- @Column(name = "REVIEW_PROPOSAL_DESCRIPTION")
- public String getReviewProposalDescription() {
- return reviewProposalDescription;
- }
-
- public void setReviewProposalDescription(String reviewProposalDescription) {
- this.reviewProposalDescription = reviewProposalDescription;
- }
-
- @Column(name = "GATEWAY_ADMIN_FIRST_NAME")
- public String getGatewayAdminFirstName() {
- return gatewayAdminFirstName;
- }
-
- public void setGatewayAdminFirstName(String gatewayAdminFirstName) {
- this.gatewayAdminFirstName = gatewayAdminFirstName;
- }
-
- @Column(name = "GATEWAY_ADMIN_LAST_NAME")
- public String getGetGatewayAdminLastName() {
- return getGatewayAdminLastName;
- }
-
- public void setGetGatewayAdminLastName(String getGatewayAdminLastName) {
- this.getGatewayAdminLastName = getGatewayAdminLastName;
- }
-
- @Column(name = "GATEWAY_ADMIN_EMAIL")
- public String getGatewayAdminEmail() {
- return gatewayAdminEmail;
- }
-
- public void setGatewayAdminEmail(String gatewayAdminEmail) {
- this.gatewayAdminEmail = gatewayAdminEmail;
- }
-
- @Column(name = "IDENTITY_SERVER_USERNAME")
- public String getIdentityServerUserName() {
- return identityServerUserName;
- }
-
- public void setIdentityServerUserName(String identityServerUserName) {
- this.identityServerUserName = identityServerUserName;
- }
-
- @Column(name = "IDENTITY_SERVER_PASSWORD_TOKEN")
- public String getIdentityServerPasswordToken() {
- return identityServerPasswordToken;
- }
-
- public void setIdentityServerPasswordToken(String identityServerPasswordToken) {
- this.identityServerPasswordToken = identityServerPasswordToken;
- }
-
- @Column(name = "REQUESTER_USERNAME")
- public String getRequesterUsername() {
- return requesterUsername;
- }
-
- public void setRequesterUsername(String requesterUsername) {
- this.requesterUsername = requesterUsername;
- }
-
- @Column(name = "DECLINED_REASON")
- public String getDeclinedReason() {
- return declinedReason;
- }
-
- public void setDeclinedReason(String declinedReason) {
- this.declinedReason = declinedReason;
- }
-
- @Column(name = "OAUTH_CLIENT_ID")
- public String getOauthClientId() {
- return oauthClientId;
- }
-
- public void setOauthClientId(String oauthClientId) {
- this.oauthClientId = oauthClientId;
- }
-
- @Column(name = "REQUEST_CREATION_TIME")
- public long getRequestCreationTime() {
- return requestCreationTime;
- }
-
- public void setRequestCreationTime(long requestCreationTime) {
- this.requestCreationTime = requestCreationTime;
- }
-
- @Column(name = "OAUTH_CLIENT_SECRET")
- public String getGetOauthClientSecret() {
- return getOauthClientSecret;
- }
-
- public void setGetOauthClientSecret(String oauthClientSecret) {
- this.getOauthClientSecret = oauthClientSecret;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/01943baf/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/workspacecatalog/NSFDemographicsEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/workspacecatalog/NSFDemographicsEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/workspacecatalog/NSFDemographicsEntity.java
deleted file mode 100644
index 0bcbafa..0000000
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/workspacecatalog/NSFDemographicsEntity.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-package org.apache.airavata.registry.core.entities.workspacecatalog;
-
-import javax.persistence.*;
-import java.util.List;
-
-@Entity
-@Table(name = "WORKSPACE_NSF_DEMOGRAPHIC")
-public class NSFDemographicsEntity {
- private String airavataInternalUserId;
- private String gender;
- private List<String> ethnicities;
- private List<String> races;
- private List<String> disabilities;
- private UserProfileEntity userProfile;
-
- @Id
- @Column(name = "AIRAVATA_INTERNAL_USER_ID")
- public String getAiravataInternalUserId() {
- return airavataInternalUserId;
- }
-
- public void setAiravataInternalUserId(String userId) {
- this.airavataInternalUserId = userId;
- }
-
- @Column(name = "GENDER")
- public String getGender() {
- return gender;
- }
-
- public void setGender(String gender) {
- this.gender = gender;
- }
-
- @ElementCollection
- @CollectionTable(name="NSF_DEMOGRAPHIC_ETHNICITY", joinColumns = @JoinColumn(name="AIRAVATA_INTERNAL_USER_ID"))
- public List<String> getEthnicities() {
- return ethnicities;
- }
-
- public void setEthnicities(List<String> ethnicities) {
- this.ethnicities = ethnicities;
- }
-
- @ElementCollection
- @CollectionTable(name="NSF_DEMOGRAPHIC_RACE", joinColumns = @JoinColumn(name="AIRAVATA_INTERNAL_USER_ID"))
- public List<String> getRaces() {
- return races;
- }
-
- public void setRaces(List<String> races) {
- this.races = races;
- }
-
- @ElementCollection
- @CollectionTable(name="NSF_DEMOGRAPHIC_DISABILITY", joinColumns = @JoinColumn(name="AIRAVATA_INTERNAL_USER_ID"))
- public List<String> getDisabilities() {
- return disabilities;
- }
-
- public void setDisabilities(List<String> disabilities) {
- this.disabilities = disabilities;
- }
-
- @OneToOne(targetEntity = UserProfileEntity.class, cascade = CascadeType.ALL)
- @PrimaryKeyJoinColumn(name = "AIRAVATA_INTERNAL_USER_ID", referencedColumnName = "AIRAVATA_INTERNAL_USER_ID")
- public UserProfileEntity getUserProfile() {
- return userProfile;
- }
-
- public void setUserProfile(UserProfileEntity userProfile) {
- this.userProfile = userProfile;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/01943baf/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/workspacecatalog/NotificationEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/workspacecatalog/NotificationEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/workspacecatalog/NotificationEntity.java
deleted file mode 100644
index 67f8af2..0000000
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/workspacecatalog/NotificationEntity.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-package org.apache.airavata.registry.core.entities.workspacecatalog;
-
-import javax.persistence.*;
-
-@Entity
-@Table(name = "WORKSPACE_NOTIFICATION")
-public class NotificationEntity {
- private String notificationId;
- private String gatewayId;
- private String title;
- private String notificationMessage;
- private long creationTime;
- private long publishedTime;
- private long expirationTime;
- private String priority;
-
- @Id
- @Column(name = "NOTIFICATION_ID")
- public String getNotificationId() {
- return notificationId;
- }
-
- public void setNotificationId(String notificationId) {
- this.notificationId = notificationId;
- }
-
- @Column(name = "GATEWAY_ID")
- public String getGatewayId() {
- return gatewayId;
- }
-
- public void setGatewayId(String gatewayId) {
- this.gatewayId = gatewayId;
- }
-
- @Column(name = "TITLE")
- public String getTitle() {
- return title;
- }
-
- public void setTitle(String title) {
- this.title = title;
- }
-
- @Lob
- @Column(name = "NOTIFICATION_MESSAGE")
- public String getNotificationMessage() {
- return notificationMessage;
- }
-
- public void setNotificationMessage(String notificationMessage) {
- this.notificationMessage = notificationMessage;
- }
-
- @Column(name = "CREATION_TIME")
- public long getCreationTime() {
- return creationTime;
- }
-
- public void setCreationTime(long creationTime) {
- this.creationTime = creationTime;
- }
-
- @Column(name = "PUBLISHED_TIME")
- public long getPublishedTime() {
- return publishedTime;
- }
-
- public void setPublishedTime(long publishedTime) {
- this.publishedTime = publishedTime;
- }
-
- @Column(name = "EXPIRATION_TIME")
- public long getExpirationTime() {
- return expirationTime;
- }
-
- public void setExpirationTime(long expirationTime) {
- this.expirationTime = expirationTime;
- }
-
- @Column(name = "PRIORITY")
- public String getPriority() {
- return priority;
- }
-
- public void setPriority(String priority) {
- this.priority = priority;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/01943baf/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/workspacecatalog/ProjectEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/workspacecatalog/ProjectEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/workspacecatalog/ProjectEntity.java
deleted file mode 100644
index 31e0868..0000000
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/workspacecatalog/ProjectEntity.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-package org.apache.airavata.registry.core.entities.workspacecatalog;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-@Entity
-@Table(name = "WORKSPACE_PROJECT")
-public class ProjectEntity {
- private String projectID;
- private String owner;
- private String gatewayId;
- private String name;
- private String description;
- private long creationTime;
-
- @Id
- @Column(name = "PROJECT_ID")
- public String getProjectID() {
- return projectID;
- }
-
- public void setProjectID(String projectID) {
- this.projectID = projectID;
- }
-
- @Column(name = "OWNER")
- public String getOwner() {
- return owner;
- }
-
- public void setOwner(String owner) {
- this.owner = owner;
- }
-
- @Column(name = "GATEWAY_ID")
- public String getGatewayId() {
- return gatewayId;
- }
-
- public void setGatewayId(String gatewayId) {
- this.gatewayId = gatewayId;
- }
-
- @Column(name = "PROJECT_NAME")
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- @Column(name = "DESCRIPTION")
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- @Column(name = "CREATION_TIME")
- public long getCreationTime() {
- return creationTime;
- }
-
- public void setCreationTime(long creationTime) {
- this.creationTime = creationTime;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/01943baf/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/workspacecatalog/UserProfileEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/workspacecatalog/UserProfileEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/workspacecatalog/UserProfileEntity.java
deleted file mode 100644
index 7dd51ed..0000000
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/workspacecatalog/UserProfileEntity.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-package org.apache.airavata.registry.core.entities.workspacecatalog;
-
-import javax.persistence.*;
-import java.util.List;
-
-@Entity
-@Table(name="WORKSPACE_USER_PROFILE")
-public class UserProfileEntity {
- private String airavataInternalUserId;
- private String userId;
- private String gatewayId;
- private String userModelVersion;
- private String userName;
- private String orcidId;
- private String country;
- private String homeOrganization;
- private String orginationAffiliation;
- private long creationTime;
- private long lastAccessTime;
- private long validUntil;
- private String state;
- private String comments;
- private List<String> labeledURI;
- private String gpgKey;
- private String timeZone;
-
- private List<String> nationality;
- private List<String> emails;
- private List<String> phones;
- private NSFDemographicsEntity nsfDemographics;
-
- @Id
- @Column(name = "AIRAVATA_INTERNAL_USER_ID")
- public String getAiravataInternalUserId() {
- return airavataInternalUserId;
- }
-
- public void setAiravataInternalUserId(String id) {
- this.airavataInternalUserId = id;
- }
-
- @Column(name = "USER_ID")
- public String getUserId() {
- return userId;
- }
-
- public void setUserId(String userId) {
- this.userId = userId;
- }
-
- @Column(name = "GATEWAY_ID")
- public String getGatewayId() {
- return gatewayId;
- }
-
- public void setGatewayId(String gatewayId) {
- this.gatewayId = gatewayId;
- }
-
- @Column(name = "USER_MODEL_VERSION")
- public String getUserModelVersion() {
- return userModelVersion;
- }
-
- public void setUserModelVersion(String userModelVersion) {
- this.userModelVersion = userModelVersion;
- }
-
- @ElementCollection
- @CollectionTable(name="USER_PROFILE_EMAIL", joinColumns = @JoinColumn(name="AIRAVATA_INTERNAL_USER_ID"))
- public List<String> getEmails() {
- return emails;
- }
-
- public void setEmails(List<String> emails) {
- this.emails = emails;
- }
-
- @Column(name = "USER_NAME")
- public String getUserName() {
- return userName;
- }
-
- public void setUserName(String userName) {
- this.userName = userName;
- }
-
- @Column(name = "ORCID_ID")
- public String getOrcidId() {
- return orcidId;
- }
-
- public void setOrcidId(String orcidId) {
- this.orcidId = orcidId;
- }
-
- @ElementCollection
- @CollectionTable(name="USER_PROFILE_PHONE", joinColumns = @JoinColumn(name="AIRAVATA_INTERNAL_USER_ID"))
- public List<String> getPhones() {
- return phones;
- }
-
- public void setPhones(List<String> phones) {
- this.phones = phones;
- }
-
- @Column(name = "COUNTRY")
- public String getCountry() {
- return country;
- }
-
- public void setCountry(String country) {
- this.country = country;
- }
-
- @ElementCollection
- @CollectionTable(name="USER_PROFILE_NATIONALITY", joinColumns = @JoinColumn(name="AIRAVATA_INTERNAL_USER_ID"))
- public List<String> getNationality() {
- return nationality;
- }
-
- public void setNationality(List<String> nationality) {
- this.nationality = nationality;
- }
-
- @Column(name = "HOME_ORGANIZATION")
- public String getHomeOrganization() {
- return homeOrganization;
- }
-
- public void setHomeOrganization(String homeOrganization) {
- this.homeOrganization = homeOrganization;
- }
-
- @Column(name = "ORIGINATION_AFFILIATION")
- public String getOrginationAffiliation() {
- return orginationAffiliation;
- }
-
- public void setOrginationAffiliation(String orginationAffiliation) {
- this.orginationAffiliation = orginationAffiliation;
- }
-
- @Column(name="CREATION_TIME")
- public long getCreationTime() {
- return creationTime;
- }
-
- public void setCreationTime(long creationTime) {
- this.creationTime = creationTime;
- }
-
- @Column(name = "LAST_ACCESS_TIME")
- public long getLastAccessTime() {
- return lastAccessTime;
- }
-
- public void setLastAccessTime(long lastAccessTime) {
- this.lastAccessTime = lastAccessTime;
- }
-
- @Column(name = "VALID_UNTIL")
- public long getValidUntil() {
- return validUntil;
- }
-
- public void setValidUntil(long validUntil) {
- this.validUntil = validUntil;
- }
-
- @Column(name = "STATE")
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
- @Lob
- @Column(name = "COMMENTS")
- public String getComments() {
- return comments;
- }
-
- public void setComments(String comments) {
- this.comments = comments;
- }
-
- @ElementCollection
- @CollectionTable(name="USER_PROFILE_LABELED_URI", joinColumns = @JoinColumn(name="AIRAVATA_INTERNAL_USER_ID"))
- public List<String> getLabeledURI() {
- return labeledURI;
- }
-
- public void setLabeledURI(List<String> labeledURI) {
- this.labeledURI = labeledURI;
- }
-
- @Lob
- @Column(name = "GPG_KEY")
- public String getGpgKey() {
- return gpgKey;
- }
-
- public void setGpgKey(String gpgKey) {
- this.gpgKey = gpgKey;
- }
-
- @Column(name = "TIME_ZONE")
- public String getTimeZone() {
- return timeZone;
- }
-
- public void setTimeZone(String timeZone) {
- this.timeZone = timeZone;
- }
-
- @OneToOne(targetEntity = NSFDemographicsEntity.class, cascade = CascadeType.ALL, mappedBy = "userProfile")
- public NSFDemographicsEntity getNsfDemographics() {
- return nsfDemographics;
- }
-
- public void setNsfDemographics(NSFDemographicsEntity nsfDemographics) {
- this.nsfDemographics = nsfDemographics;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/01943baf/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/AbstractRepository.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/AbstractRepository.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/AbstractRepository.java
deleted file mode 100644
index a83928d..0000000
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/AbstractRepository.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-package org.apache.airavata.registry.core.repositories;
-
-import org.apache.airavata.registry.core.utils.JPAUtils;
-import org.apache.airavata.registry.core.utils.ObjectMapperSingleton;
-import org.dozer.Mapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.persistence.Query;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-public abstract class AbstractRepository<T, E, Id> {
- private final static Logger logger = LoggerFactory.getLogger(AbstractRepository.class);
-
- private Class<T> thriftGenericClass;
- private Class<E> dbEntityGenericClass;
-
- public AbstractRepository(Class<T> thriftGenericClass, Class<E> dbEntityGenericClass) {
- this.thriftGenericClass = thriftGenericClass;
- this.dbEntityGenericClass = dbEntityGenericClass;
- }
-
- public T create(T t) {
- return update(t);
- }
-
- public T update(T t) {
- Mapper mapper = ObjectMapperSingleton.getInstance();
- E entity = mapper.map(t, dbEntityGenericClass);
- E persistedCopy = JPAUtils.execute(entityManager -> entityManager.merge(entity));
- return mapper.map(persistedCopy, thriftGenericClass);
- }
-
- public boolean delete(Id id) {
- JPAUtils.execute(entityManager -> {
- E entity = entityManager.find(dbEntityGenericClass, id);
- entityManager.remove(entity);
- return entity;
- });
- return true;
- }
-
- public T get(Id id) {
- E entity = JPAUtils.execute(entityManager -> entityManager
- .find(dbEntityGenericClass, id));
- Mapper mapper = ObjectMapperSingleton.getInstance();
- return mapper.map(entity, thriftGenericClass);
- }
-
- public List<T> select(String query, int limit, int offset) {
- List resultSet = (List) JPAUtils.execute(entityManager -> entityManager.createQuery(query).setFirstResult(offset)
- .setMaxResults(offset).getResultList());
- Mapper mapper = ObjectMapperSingleton.getInstance();
- List<T> gatewayList = new ArrayList<>();
- resultSet.stream().forEach(rs -> gatewayList.add(mapper.map(rs, thriftGenericClass)));
- return gatewayList;
- }
-
- public List<T> select(String query, int limit, int offset, Map<String, Object> queryParams) {
- List resultSet = (List) JPAUtils.execute(entityManager -> {
- Query jpaQuery = entityManager.createQuery(query);
-
- for (Map.Entry<String, Object> entry : queryParams.entrySet()) {
-
- jpaQuery.setParameter(entry.getKey(), entry.getValue());
- }
-
- return jpaQuery.setFirstResult(offset).setMaxResults(limit).getResultList();
-
- });
- Mapper mapper = ObjectMapperSingleton.getInstance();
- List<T> gatewayList = new ArrayList<>();
- resultSet.stream().forEach(rs -> gatewayList.add(mapper.map(rs, thriftGenericClass)));
- return gatewayList;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/01943baf/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/workspacecatalog/GatewayRepository.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/workspacecatalog/GatewayRepository.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/workspacecatalog/GatewayRepository.java
deleted file mode 100644
index 9a1c6d6..0000000
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/workspacecatalog/GatewayRepository.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-package org.apache.airavata.registry.core.repositories.workspacecatalog;
-
-import org.apache.airavata.model.workspace.Gateway;
-import org.apache.airavata.registry.core.entities.workspacecatalog.GatewayEntity;
-import org.apache.airavata.registry.core.repositories.AbstractRepository;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class GatewayRepository extends AbstractRepository<Gateway, GatewayEntity, String> {
- private final static Logger logger = LoggerFactory.getLogger(GatewayRepository.class);
-
- public GatewayRepository(Class<Gateway> thriftGenericClass, Class<GatewayEntity> dbEntityGenericClass) {
- super(thriftGenericClass, dbEntityGenericClass);
-
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/01943baf/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/workspacecatalog/NotificationRepository.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/workspacecatalog/NotificationRepository.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/workspacecatalog/NotificationRepository.java
deleted file mode 100644
index 8332024..0000000
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/workspacecatalog/NotificationRepository.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-package org.apache.airavata.registry.core.repositories.workspacecatalog;
-
-import org.apache.airavata.model.workspace.Notification;
-import org.apache.airavata.registry.core.entities.workspacecatalog.NotificationEntity;
-import org.apache.airavata.registry.core.repositories.AbstractRepository;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class NotificationRepository extends AbstractRepository<Notification, NotificationEntity, String> {
- private final static Logger logger = LoggerFactory.getLogger(NotificationRepository.class);
-
- public NotificationRepository(Class thriftGenericClass, Class dbEntityGenericClass) {
- super(thriftGenericClass, dbEntityGenericClass);
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/01943baf/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/workspacecatalog/ProjectRepository.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/workspacecatalog/ProjectRepository.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/workspacecatalog/ProjectRepository.java
deleted file mode 100644
index eebf5fb..0000000
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/workspacecatalog/ProjectRepository.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-package org.apache.airavata.registry.core.repositories.workspacecatalog;
-
-import org.apache.airavata.model.workspace.Project;
-import org.apache.airavata.registry.core.entities.workspacecatalog.ProjectEntity;
-import org.apache.airavata.registry.core.repositories.AbstractRepository;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class ProjectRepository extends AbstractRepository<Project, ProjectEntity, String> {
- private final static Logger logger = LoggerFactory.getLogger(ProjectRepository.class);
-
- public ProjectRepository(Class<Project> thriftGenericClass, Class<ProjectEntity> dbEntityGenericClass) {
- super(thriftGenericClass, dbEntityGenericClass);
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/01943baf/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/workspacecatalog/UserProfileRepository.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/workspacecatalog/UserProfileRepository.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/workspacecatalog/UserProfileRepository.java
deleted file mode 100644
index de0f99e..0000000
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/workspacecatalog/UserProfileRepository.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-package org.apache.airavata.registry.core.repositories.workspacecatalog;
-
-import org.apache.airavata.model.user.UserProfile;
-import org.apache.airavata.registry.core.entities.workspacecatalog.UserProfileEntity;
-import org.apache.airavata.registry.core.repositories.AbstractRepository;
-import org.apache.airavata.registry.core.utils.QueryConstants;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class UserProfileRepository extends AbstractRepository<UserProfile, UserProfileEntity, String> {
- private final static Logger logger = LoggerFactory.getLogger(UserProfileRepository.class);
-
- public UserProfileRepository(Class<UserProfile> thriftGenericClass, Class<UserProfileEntity> dbEntityGenericClass) {
- super(thriftGenericClass, dbEntityGenericClass);
- }
-
- @Override
- public List<UserProfile> select(String query, int offset, int limit) {
- throw new UnsupportedOperationException("Due to performance overheads this method is not supported. Instead use" +
- " UserProfileSummaryRepository");
- }
-
- public UserProfile getUserProfileByIdAndGateWay(String userId, String gatewayId) {
-
- UserProfile userProfile = null;
-
- Map<String, Object> queryParam = new HashMap<String, Object>();
- queryParam.put(UserProfile._Fields.USER_ID.getFieldName(), userId);
- queryParam.put(UserProfile._Fields.GATEWAY_ID.getFieldName(), gatewayId);
- List<UserProfile> resultList = select(QueryConstants.FIND_USER_PROFILE_BY_USER_ID, 0, 1, queryParam);
-
- if (resultList != null && resultList.size() > 0)
- userProfile = resultList.get(0);
-
-
- return userProfile;
- }
-
- public List<UserProfile> getAllUserProfilesInGateway(String gatewayId, int offset, int limit) {
-
- Map<String, Object> queryParam = new HashMap<String, Object>();
- queryParam.put(UserProfile._Fields.GATEWAY_ID.getFieldName(), gatewayId);
-
- List<UserProfile> resultList = select(QueryConstants.FIND_ALL_USER_PROFILES_BY_GATEWAY_ID, limit, offset, queryParam);
-
- return resultList;
- }
-
- public UserProfile getUserProfileByNameAndGateWay(String name, String gatewayId) {
-
- UserProfile userProfile = null;
-
- Map<String, Object> queryParam = new HashMap<String, Object>();
- queryParam.put(UserProfile._Fields.USER_NAME.getFieldName(), name);
- queryParam.put(UserProfile._Fields.GATEWAY_ID.getFieldName(), gatewayId);
- List<UserProfile> resultList = select(QueryConstants.FIND_USER_PROFILE_BY_USER_NAME, 0, 1, queryParam);
-
- if (resultList != null && resultList.size() > 0)
- userProfile = resultList.get(0);
-
-
- return userProfile;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/01943baf/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/utils/Committer.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/utils/Committer.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/utils/Committer.java
deleted file mode 100644
index 07f8244..0000000
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/utils/Committer.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-package org.apache.airavata.registry.core.utils;
-
-@FunctionalInterface
-public interface Committer<T, R> {
-
- R commit(T t);
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/01943baf/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/utils/JPAConstants.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/utils/JPAConstants.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/utils/JPAConstants.java
deleted file mode 100644
index 25263e1..0000000
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/utils/JPAConstants.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.registry.core.utils;
-public class JPAConstants {
- public static final String KEY_JDBC_URL = "registry.jdbc.url";
- public static final String KEY_JDBC_USER = "registry.jdbc.user";
- public static final String KEY_JDBC_PASSWORD = "registry.jdbc.password";
- public static final String KEY_JDBC_DRIVER = "registry.jdbc.driver";
- public static final String KEY_DERBY_START_ENABLE = "start.derby.server.mode";
- public static final String VALIDATION_QUERY = "validationQuery";
- public static final String JPA_CACHE_SIZE = "jpa.cache.size";
- public static final String ENABLE_CACHING = "cache.enable";
-}
http://git-wip-us.apache.org/repos/asf/airavata/blob/01943baf/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/utils/JPAUtils.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/utils/JPAUtils.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/utils/JPAUtils.java
deleted file mode 100644
index 4f54863..0000000
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/utils/JPAUtils.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-package org.apache.airavata.registry.core.utils;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.persistence.*;
-import java.util.HashMap;
-import java.util.Map;
-
-public class JPAUtils {
- private final static Logger logger = LoggerFactory.getLogger(JPAUtils.class);
- private static final String PERSISTENCE_UNIT_NAME = "airavata_catalog";
- @PersistenceUnit(unitName = "airavata_catalog")
- protected static EntityManagerFactory factory;
- @PersistenceContext(unitName = "airavata_catalog")
- private static EntityManager entityManager;
-
- public static EntityManager getEntityManager(){
-
- if (factory == null) {
- //FIXME
- String connectionProperties = "DriverClassName=" + Utils.getJDBCDriver() + "," + "Url=" +
- Utils.getJDBCURL() + "?autoReconnect=true," +
- "Username=" + Utils.getJDBCUser() + "," + "Password=" + Utils.getJDBCPassword() +
- ",validationQuery=" + Utils.getValidationQuery();
- logger.info(connectionProperties);
- Map<String, String> properties = new HashMap<String, String>();
- properties.put("openjpa.ConnectionDriverName", "org.apache.commons.dbcp.BasicDataSource");
- properties.put("openjpa.ConnectionProperties", connectionProperties);
- properties.put("openjpa.DynamicEnhancementAgent", "true");
- properties.put("openjpa.RuntimeUnenhancedClasses", "warn");
- properties.put("openjpa.RemoteCommitProvider", "sjvm");
- properties.put("openjpa.Log", "DefaultLevel=INFO, Runtime=INFO, Tool=INFO, SQL=INFO");
- properties.put("openjpa.jdbc.SynchronizeMappings", "buildSchema(ForeignKeys=true)");
- properties.put("openjpa.jdbc.QuerySQLCache", "false");
- properties.put("openjpa.ConnectionFactoryProperties", "PrettyPrint=true, PrettyPrintLineLength=72," +
- " PrintParameters=true, MaxActive=10, MaxIdle=5, MinIdle=2, MaxWait=31536000, autoReconnect=true");
- factory = Persistence.createEntityManagerFactory(PERSISTENCE_UNIT_NAME, properties);
- }
-
- entityManager = factory.createEntityManager();
- return entityManager;
- }
-
- public static <R> R execute(Committer<EntityManager, R> committer){
- EntityManager entityManager = JPAUtils.getEntityManager();
- try {
- entityManager.getTransaction().begin();
- R r = committer.commit(entityManager);
- entityManager.getTransaction().commit();
- return r;
- }finally {
- if (entityManager != null && entityManager.isOpen()) {
- if (entityManager.getTransaction().isActive()) {
- entityManager.getTransaction().rollback();
- }
- entityManager.close();
- }
- }
- }
-
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/01943baf/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/utils/ObjectMapperSingleton.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/utils/ObjectMapperSingleton.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/utils/ObjectMapperSingleton.java
deleted file mode 100644
index 9189460..0000000
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/utils/ObjectMapperSingleton.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-package org.apache.airavata.registry.core.utils;
-
-import org.dozer.DozerBeanMapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class ObjectMapperSingleton extends DozerBeanMapper{
- private final static Logger logger = LoggerFactory.getLogger(ObjectMapperSingleton.class);
-
- private static ObjectMapperSingleton instance;
-
- private ObjectMapperSingleton(){}
-
- public static ObjectMapperSingleton getInstance(){
- if(instance == null)
- instance = new ObjectMapperSingleton();
- return instance;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/01943baf/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/utils/QueryConstants.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/utils/QueryConstants.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/utils/QueryConstants.java
deleted file mode 100644
index 171317e..0000000
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/utils/QueryConstants.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.apache.airavata.registry.core.utils;
-
-import org.apache.airavata.model.user.UserProfile;
-
-/**
- * Created by abhij on 11/11/2016.
- */
-public interface QueryConstants {
-
-
-
- String FIND_USER_PROFILE_BY_USER_ID = "SELECT u FROM UserProfileEntity u " +
- "where u.userId LIKE :" + UserProfile._Fields.USER_ID.getFieldName() + " " +
- "AND u.gatewayId LIKE :"+ UserProfile._Fields.GATEWAY_ID.getFieldName() + "";
-
- String FIND_ALL_USER_PROFILES_BY_GATEWAY_ID = "SELECT u FROM UserProfileEntity u " +
- "where u.gatewayId LIKE :"+ UserProfile._Fields.GATEWAY_ID.getFieldName() + "";
-
- String FIND_USER_PROFILE_BY_USER_NAME = "SELECT u FROM UserProfileEntity u " +
- "where u.userId LIKE :" + UserProfile._Fields.USER_NAME.getFieldName() + " " +
- "AND u.gatewayId LIKE :"+ UserProfile._Fields.GATEWAY_ID.getFieldName() + "";
-}
http://git-wip-us.apache.org/repos/asf/airavata/blob/01943baf/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/utils/Utils.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/utils/Utils.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/utils/Utils.java
deleted file mode 100644
index 7b5c60a..0000000
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/utils/Utils.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.airavata.registry.core.utils;
-
-import org.apache.airavata.common.exception.ApplicationSettingsException;
-import org.apache.airavata.common.utils.ServerSettings;
-import org.apache.airavata.registry.core.utils.JPAConstants;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.net.URI;
-
-
-public class Utils {
- private final static Logger logger = LoggerFactory.getLogger(Utils.class);
-
- public static String getJDBCFullURL(){
- String jdbcUrl = getJDBCURL();
- String jdbcUser = getJDBCUser();
- String jdbcPassword = getJDBCPassword();
- jdbcUrl = jdbcUrl + "?" + "user=" + jdbcUser + "&" + "password=" + jdbcPassword;
- return jdbcUrl;
- }
-
- public static String getJDBCURL(){
- try {
- return ServerSettings.getSetting(JPAConstants.KEY_JDBC_URL);
- } catch (ApplicationSettingsException e) {
- logger.error(e.getMessage(), e);
- return null;
- }
- }
-
- public static String getHost(){
- try{
- String jdbcURL = getJDBCURL();
- String cleanURI = jdbcURL.substring(5);
- URI uri = URI.create(cleanURI);
- return uri.getHost();
- } catch (Exception e) {
- logger.error(e.getMessage(), e);
- return null;
- }
- }
-
- public static int getPort(){
- try{
- String jdbcURL = getJDBCURL();
- String cleanURI = jdbcURL.substring(5);
- URI uri = URI.create(cleanURI);
- return uri.getPort();
- } catch (Exception e) {
- logger.error(e.getMessage(), e);
- return -1;
- }
- }
-
- public static int getJPACacheSize (){
- try {
- String cache = ServerSettings.getSetting(JPAConstants.JPA_CACHE_SIZE, "5000");
- return Integer.parseInt(cache);
- }catch (Exception e){
- logger.error(e.getMessage(), e);
- return -1;
- }
- }
-
- public static String isCachingEnabled (){
- try {
- return ServerSettings.getSetting(JPAConstants.ENABLE_CACHING, "true");
- }catch (Exception e){
- logger.error(e.getMessage(), e);
- return "true";
- }
- }
-
- public static String getDBType(){
- try{
- String jdbcURL = getJDBCURL();
- String cleanURI = jdbcURL.substring(5);
- URI uri = URI.create(cleanURI);
- return uri.getScheme();
- } catch (Exception e) {
- logger.error(e.getMessage(), e);
- return null;
- }
- }
-
- public static boolean isDerbyStartEnabled(){
- try {
- String s = ServerSettings.getSetting(JPAConstants.KEY_DERBY_START_ENABLE);
- if("true".equals(s)){
- return true;
- }
- } catch (ApplicationSettingsException e) {
- logger.error(e.getMessage(), e);
- return false;
- }
- return false;
- }
-
- public static String getJDBCUser(){
- try {
- return ServerSettings.getSetting(JPAConstants.KEY_JDBC_USER);
- } catch (ApplicationSettingsException e) {
- logger.error(e.getMessage(), e);
- return null;
- }
- }
-
- public static String getValidationQuery(){
- try {
- return ServerSettings.getSetting(JPAConstants.VALIDATION_QUERY);
- } catch (ApplicationSettingsException e) {
- logger.error(e.getMessage(), e);
- return null;
- }
- }
-
- public static String getJDBCPassword(){
- try {
- return ServerSettings.getSetting(JPAConstants.KEY_JDBC_PASSWORD);
- } catch (ApplicationSettingsException e) {
- logger.error(e.getMessage(), e);
- return null;
- }
-
- }
-
- public static String getJDBCDriver(){
- try {
- return ServerSettings.getSetting(JPAConstants.KEY_JDBC_DRIVER);
- } catch (ApplicationSettingsException e) {
- logger.error(e.getMessage(), e);
- return null;
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/01943baf/modules/registry-refactoring/src/main/resources/META-INF/persistence.xml
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/resources/META-INF/persistence.xml b/modules/registry-refactoring/src/main/resources/META-INF/persistence.xml
deleted file mode 100644
index 76c965a..0000000
--- a/modules/registry-refactoring/src/main/resources/META-INF/persistence.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<!--*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-* -->
-<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="2.0">
- <persistence-unit name="airavata_catalog">
- <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
- <class>org.apache.airavata.registry.core.entities.workspacecatalog.GatewayEntity</class>
- <class>org.apache.airavata.registry.core.entities.workspacecatalog.UserProfileEntity</class>
- <class>org.apache.airavata.registry.core.entities.workspacecatalog.NSFDemographicsEntity</class>
- <class>org.apache.airavata.registry.core.entities.workspacecatalog.NotificationEntity</class>
- <class>org.apache.airavata.registry.core.entities.workspacecatalog.ProjectEntity</class>
- <exclude-unlisted-classes>true</exclude-unlisted-classes>
- </persistence-unit>
-</persistence>
http://git-wip-us.apache.org/repos/asf/airavata/blob/01943baf/modules/registry-refactoring/src/main/resources/workspace_catalog.sql
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/resources/workspace_catalog.sql b/modules/registry-refactoring/src/main/resources/workspace_catalog.sql
deleted file mode 100644
index debdba4..0000000
--- a/modules/registry-refactoring/src/main/resources/workspace_catalog.sql
+++ /dev/null
@@ -1,125 +0,0 @@
-
-CREATE TABLE IF NOT EXISTS WORKSPACE_GATEWAY(
- GATEWAY_ID VARCHAR (255),
- GATEWAY_NAME VARCHAR (255),
- GATEWAY_DOMAIN VARCHAR (255),
- EMAIL_ADDRESS VARCHAR (255),
- GATEWAY_APPROVAL_STATUS VARCHAR (255),
- GATEWAY_ACRONYM VARCHAR (255),
- GATEWAY_URL VARCHAR (255),
- GATEWAY_PUBLIC_ABSTRACT TEXT,
- REVIEW_PROPOSAL_DESCRIPTION TEXT,
- GATEWAY_ADMIN_FIRST_NAME VARCHAR(255),
- GATEWAY_ADMIN_LAST_NAME VARCHAR(255),
- GATEWAY_ADMIN_EMAIL VARCHAR(255),
- IDENTITY_SERVER_USERNAME VARCHAR(255),
- IDENTITY_SERVER_PASSWORD_TOKEN VARCHAR(255),
- DECLINED_REASON VARCHAR(255),
- OAUTH_CLIENT_ID VARCHAR(255),
- OAUTH_CLIENT_SECRET VARCHAR(255),
- REQUEST_CREATION_TIME BIGINT,
- REQUESTER_USERNAME VARCHAR(255),
- PRIMARY KEY (GATEWAY_ID)
-);
-
-CREATE TABLE IF NOT EXISTS WORKSPACE_NOTIFICATION (
- NOTIFICATION_ID VARCHAR (255),
- GATEWAY_ID VARCHAR (255),
- TITLE VARCHAR (255),
- NOTIFICATION_MESSAGE TEXT,
- CREATION_TIME BIGINT,
- PUBLISHED_TIME BIGINT,
- EXPIRATION_TIME BIGINT,
- PRIORITY VARCHAR (255),
- PRIMARY KEY (NOTIFICATION_ID),
- FOREIGN KEY (GATEWAY_ID) REFERENCES WORKSPACE_GATEWAY(GATEWAY_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE IF NOT EXISTS WORKSPACE_USER_PROFILE (
- AIRAVATA_INTERNAL_USER_ID VARCHAR (255),
- USER_ID VARCHAR (255),
- GATEWAY_ID VARCHAR (255),
- USER_MODEL_VERSION VARCHAR (255),
- USER_NAME VARCHAR (255),
- ORCID_ID VARCHAR (255),
- COUNTRY VARCHAR (255),
- HOME_ORGANIZATION VARCHAR (255),
- ORIGINATION_AFFILIATION VARCHAR (255),
- CREATION_TIME BIGINT,
- LAST_ACCESS_TIME BIGINT,
- VALID_UNTIL BIGINT,
- STATE VARCHAR (255),
- COMMENTS TEXT,
- GPG_KEY VARCHAR (8192),
- TIME_ZONE VARCHAR (255),
- PRIMARY KEY (AIRAVATA_INTERNAL_USER_ID),
- FOREIGN KEY (GATEWAY_ID) REFERENCES WORKSPACE_GATEWAY(GATEWAY_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE IF NOT EXISTS WORKSPACE_USER_PROFILE_EMAIL (
- AIRAVATA_INTERNAL_USER_ID VARCHAR (255),
- EMAIL VARCHAR (255),
- PRIMARY KEY (AIRAVATA_INTERNAL_USER_ID, EMAIL),
- FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID) REFERENCES WORKSPACE_USER_PROFILE(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE IF NOT EXISTS WORKSPACE_USER_PROFILE_PHONE (
- AIRAVATA_INTERNAL_USER_ID VARCHAR (255),
- PHONE VARCHAR (255),
- PRIMARY KEY (AIRAVATA_INTERNAL_USER_ID, PHONE ),
- FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID) REFERENCES WORKSPACE_USER_PROFILE(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE IF NOT EXISTS WORKSPACE_USER_PROFILE_NATIONALITY (
- AIRAVATA_INTERNAL_USER_ID VARCHAR (255),
- NATIONALITY VARCHAR (255),
- PRIMARY KEY (AIRAVATA_INTERNAL_USER_ID, NATIONALITY ),
- FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID) REFERENCES WORKSPACE_USER_PROFILE(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE IF NOT EXISTS WORKSPACE_USER_PROFILE_LABELED_URI (
- AIRAVATA_INTERNAL_USER_ID VARCHAR (255),
- LABELED_URI VARCHAR (255),
- PRIMARY KEY (AIRAVATA_INTERNAL_USER_ID, LABELED_URI ),
- FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID) REFERENCES WORKSPACE_USER_PROFILE(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE IF NOT EXISTS WORKSPACE_NSF_DEMOGRAPHIC (
- AIRAVATA_INTERNAL_USER_ID VARCHAR (255),
- GENDER VARCHAR (255),
- PRIMARY KEY (AIRAVATA_INTERNAL_USER_ID),
- FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID) REFERENCES WORKSPACE_USER_PROFILE(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE IF NOT EXISTS WORKSPACE_NSF_DEMOGRAPHIC_ETHNICITY (
- AIRAVATA_INTERNAL_USER_ID VARCHAR (255),
- ETHNICITY VARCHAR (255),
- PRIMARY KEY (AIRAVATA_INTERNAL_USER_ID, ETHNICITY ),
- FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID) REFERENCES WORKSPACE_NSF_DEMOGRAPHIC(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE IF NOT EXISTS WORKSPACE_NSF_DEMOGRAPHIC_RACE (
- AIRAVATA_INTERNAL_USER_ID VARCHAR (255),
- RACE VARCHAR (255),
- PRIMARY KEY (AIRAVATA_INTERNAL_USER_ID, RACE ),
- FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID) REFERENCES WORKSPACE_NSF_DEMOGRAPHIC(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE IF NOT EXISTS WORKSPACE_NSF_DEMOGRAPHIC_DISABILITY (
- AIRAVATA_INTERNAL_USER_ID VARCHAR (255),
- DISABILITY VARCHAR (255),
- PRIMARY KEY (AIRAVATA_INTERNAL_USER_ID, DISABILITY ),
- FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID) REFERENCES WORKSPACE_NSF_DEMOGRAPHIC(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE IF NOT EXISTS WORKSPACE_PROJECT(
- PROJECT_ID VARCHAR (255),
- OWNER VARCHAR (255),
- GATEWAY_ID VARCHAR (255),
- PROJECT_NAME VARCHAR (255),
- DESCRIPTION VARCHAR (255),
- CREATION_TIME BIGINT,
- PRIMARY KEY (PROJECT_ID),
- FOREIGN KEY(OWNER) REFERENCES WORKSPACE_USER_PROFILE(AIRAVATA_INTERNAL_USER_ID),
- FOREIGN KEY(GATEWAY_ID) REFERENCES WORKSPACE_GATEWAY(GATEWAY_ID) ON DELETE CASCADE
-);
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/01943baf/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/WorkspaceRepositoryTest.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/WorkspaceRepositoryTest.java b/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/WorkspaceRepositoryTest.java
deleted file mode 100644
index a168f0d..0000000
--- a/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/WorkspaceRepositoryTest.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-package org.apache.airavata.registry.core.repositories;
-
-import org.apache.airavata.model.user.UserProfile;
-import org.apache.airavata.model.workspace.Gateway;
-import org.apache.airavata.model.workspace.GatewayApprovalStatus;
-import org.apache.airavata.model.workspace.Notification;
-import org.apache.airavata.model.workspace.Project;
-import org.apache.airavata.registry.core.entities.workspacecatalog.GatewayEntity;
-import org.apache.airavata.registry.core.entities.workspacecatalog.NotificationEntity;
-import org.apache.airavata.registry.core.entities.workspacecatalog.ProjectEntity;
-import org.apache.airavata.registry.core.entities.workspacecatalog.UserProfileEntity;
-import org.apache.airavata.registry.core.repositories.workspacecatalog.GatewayRepository;
-import org.apache.airavata.registry.core.repositories.workspacecatalog.NotificationRepository;
-import org.apache.airavata.registry.core.repositories.workspacecatalog.ProjectRepository;
-import org.apache.airavata.registry.core.repositories.workspacecatalog.UserProfileRepository;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.UUID;
-
-public class WorkspaceRepositoryTest {
- private final static Logger logger = LoggerFactory.getLogger(WorkspaceRepositoryTest.class);
-
- private GatewayRepository gatewayRepository;
- private NotificationRepository notificationRepository;
- private UserProfileRepository userProfileRepository;
- private ProjectRepository projectRepository;
- private String gatewayId;
- private String notificationId;
- private String userId;
- private String projectId;
-
- private final String GATEWAY_DOMAIN = "test1.com";
- private final String NOTIFY_MESSAGE = "NotifyMe";
- private final String USER_COMMENT = "TestComment";
- private final String PROJECT_DESCRIPTION = "Test Description";
-
-
- @Before
- public void setupRepository() {
-
- gatewayRepository = new GatewayRepository(Gateway.class, GatewayEntity.class);
- notificationRepository = new NotificationRepository(Notification.class,
- NotificationEntity.class);
- userProfileRepository = new UserProfileRepository(UserProfile.class, UserProfileEntity.class);
- projectRepository = new ProjectRepository(Project.class, ProjectEntity.class);
-
- gatewayId = "test.com" + System.currentTimeMillis();
- notificationId = UUID.randomUUID().toString();
- userId = "testuser" + System.currentTimeMillis();
- projectId = "project" + System.currentTimeMillis();
- }
-
- @Test
- public void userProfileRepositoryTest() {
-
- /*
- * Creating Gateway required for UserProfile creation
- */
- Gateway gateway = new Gateway();
- gateway.setGatewayApprovalStatus(GatewayApprovalStatus.ACTIVE);
- gateway.setGatewayId(gatewayId);
- gateway.setDomain(GATEWAY_DOMAIN);
- gateway = gatewayRepository.create(gateway);
- Assert.assertTrue(!gateway.getGatewayId().isEmpty());
-
-
-
- /*
- * UserProfile Instance creation
- */
- UserProfile userProfile = new UserProfile();
- userProfile.setAiravataInternalUserId(userId);
- userProfile.setGatewayId(gateway.getGatewayId());
-
- /*
- * Workspace UserProfile Repository Insert Operation Test
- */
- userProfile = userProfileRepository.create(userProfile);
- Assert.assertTrue(!userProfile.getAiravataInternalUserId().isEmpty());
-
- /*
- * Workspace UserProfile Repository Update Operation Test
- */
- userProfile.setComments(USER_COMMENT);
- userProfileRepository.update(userProfile);
- userProfile = userProfileRepository.get(userId);
- System.out.println(userProfile.getComments());
- Assert.assertEquals(userProfile.getComments(), USER_COMMENT);
-
- /*
- * Workspace UserProfile Repository Select Operation Test
- */
- userProfile = userProfileRepository.get(userId);
- Assert.assertNotNull(userProfile);
-
- /*
- * Workspace UserProfile Repository Delete Operation
- */
- boolean deleteResult = userProfileRepository.delete(userId);
- Assert.assertTrue(deleteResult);
- deleteResult = gatewayRepository.delete(gatewayId);
- Assert.assertTrue(deleteResult);
-
-
- }
-
- @Test
- public void projectRepositoryTest() {
-
- /*
- * Creating Gateway required for UserProfile & Project creation
- */
- Gateway gateway = new Gateway();
- gateway.setGatewayApprovalStatus(GatewayApprovalStatus.ACTIVE);
- gateway.setGatewayId(gatewayId);
- gateway.setDomain(GATEWAY_DOMAIN);
- gateway = gatewayRepository.create(gateway);
- Assert.assertTrue(!gateway.getGatewayId().isEmpty());
-
- /*
- * UserProfile Instance creation required for Project Creation
- */
- UserProfile userProfile = new UserProfile();
- userProfile.setAiravataInternalUserId(userId);
- userProfile.setGatewayId(gateway.getGatewayId());
- userProfile = userProfileRepository.create(userProfile);
- Assert.assertTrue(!userProfile.getAiravataInternalUserId().isEmpty());
-
- /*
- * Project Instance creation
- */
- Project project = new Project();
- project.setGatewayId(gatewayId);
- project.setOwner(userId);
- project.setProjectID(projectId);
- project.setGatewayIdIsSet(true);
-
-
- /*
- * Workspace Project Repository Insert Operation Test
- */
- project = projectRepository.create(project);
- Assert.assertTrue(!project.getProjectID().isEmpty());
-
- /*
- * Workspace Project Repository Update Operation Test
- */
- project.setDescription(PROJECT_DESCRIPTION);
- projectRepository.update(project);
- project = projectRepository.get(projectId);
- Assert.assertEquals(project.getDescription(), PROJECT_DESCRIPTION);
-
- /*
- * Workspace Project Repository Select Operation Test
- */
- project = projectRepository.get(projectId);
- Assert.assertNotNull(project);
-
- /*
- * Workspace Project Repository Delete Operation
- */
- boolean deleteResult = projectRepository.delete(projectId);
- Assert.assertTrue(deleteResult);
-
- deleteResult = userProfileRepository.delete(userId);
- Assert.assertTrue(deleteResult);
-
- deleteResult = gatewayRepository.delete(gatewayId);
- Assert.assertTrue(deleteResult);
-
-
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/01943baf/modules/user-profile/pom.xml
----------------------------------------------------------------------
diff --git a/modules/user-profile/pom.xml b/modules/user-profile/pom.xml
index f6349d3..70ea9dc 100644
--- a/modules/user-profile/pom.xml
+++ b/modules/user-profile/pom.xml
@@ -23,6 +23,7 @@
<modules>
<module>user-profile-stubs</module>
<module>user-profile-service</module>
+ <module>user-profile-core</module>
</modules>