http://git-wip-us.apache.org/repos/asf/airavata/blob/8e83408a/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/gateway/cpi/exception/GatewayProfileServiceException.java ---------------------------------------------------------------------- diff --git a/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/gateway/cpi/exception/GatewayProfileServiceException.java b/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/gateway/cpi/exception/GatewayProfileServiceException.java deleted file mode 100644 index 00b91f2..0000000 --- a/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/gateway/cpi/exception/GatewayProfileServiceException.java +++ /dev/null @@ -1,407 +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. - */ -/** - * Autogenerated by Thrift Compiler (0.9.3) - * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * @generated - */ -package org.apache.airavata.service.profile.gateway.cpi.exception; - -import org.apache.thrift.scheme.IScheme; -import org.apache.thrift.scheme.SchemeFactory; -import org.apache.thrift.scheme.StandardScheme; - -import org.apache.thrift.scheme.TupleScheme; -import org.apache.thrift.protocol.TTupleProtocol; -import org.apache.thrift.protocol.TProtocolException; -import org.apache.thrift.EncodingUtils; -import org.apache.thrift.TException; -import org.apache.thrift.async.AsyncMethodCallback; -import org.apache.thrift.server.AbstractNonblockingServer.*; -import java.util.List; -import java.util.ArrayList; -import java.util.Map; -import java.util.HashMap; -import java.util.EnumMap; -import java.util.Set; -import java.util.HashSet; -import java.util.EnumSet; -import java.util.Collections; -import java.util.BitSet; -import java.nio.ByteBuffer; -import java.util.Arrays; -import javax.annotation.Generated; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2017-03-06") -public class GatewayProfileServiceException extends TException implements org.apache.thrift.TBase<GatewayProfileServiceException, GatewayProfileServiceException._Fields>, java.io.Serializable, Cloneable, Comparable<GatewayProfileServiceException> { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GatewayProfileServiceException"); - - private static final org.apache.thrift.protocol.TField MESSAGE_FIELD_DESC = new org.apache.thrift.protocol.TField("message", org.apache.thrift.protocol.TType.STRING, (short)1); - - private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new GatewayProfileServiceExceptionStandardSchemeFactory()); - schemes.put(TupleScheme.class, new GatewayProfileServiceExceptionTupleSchemeFactory()); - } - - public String message; // required - - /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { - MESSAGE((short)1, "message"); - - private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); - - static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { - byName.put(field.getFieldName(), field); - } - } - - /** - * Find the _Fields constant that matches fieldId, or null if its not found. - */ - public static _Fields findByThriftId(int fieldId) { - switch(fieldId) { - case 1: // MESSAGE - return MESSAGE; - default: - return null; - } - } - - /** - * Find the _Fields constant that matches fieldId, throwing an exception - * if it is not found. - */ - public static _Fields findByThriftIdOrThrow(int fieldId) { - _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); - return fields; - } - - /** - * Find the _Fields constant that matches name, or null if its not found. - */ - public static _Fields findByName(String name) { - return byName.get(name); - } - - private final short _thriftId; - private final String _fieldName; - - _Fields(short thriftId, String fieldName) { - _thriftId = thriftId; - _fieldName = fieldName; - } - - public short getThriftFieldId() { - return _thriftId; - } - - public String getFieldName() { - return _fieldName; - } - } - - // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; - static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.MESSAGE, new org.apache.thrift.meta_data.FieldMetaData("message", org.apache.thrift.TFieldRequirementType.REQUIRED, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(GatewayProfileServiceException.class, metaDataMap); - } - - public GatewayProfileServiceException() { - } - - public GatewayProfileServiceException( - String message) - { - this(); - this.message = message; - } - - /** - * Performs a deep copy on <i>other</i>. - */ - public GatewayProfileServiceException(GatewayProfileServiceException other) { - if (other.isSetMessage()) { - this.message = other.message; - } - } - - public GatewayProfileServiceException deepCopy() { - return new GatewayProfileServiceException(this); - } - - @Override - public void clear() { - this.message = null; - } - - public String getMessage() { - return this.message; - } - - public GatewayProfileServiceException setMessage(String message) { - this.message = message; - return this; - } - - public void unsetMessage() { - this.message = null; - } - - /** Returns true if field message is set (has been assigned a value) and false otherwise */ - public boolean isSetMessage() { - return this.message != null; - } - - public void setMessageIsSet(boolean value) { - if (!value) { - this.message = null; - } - } - - public void setFieldValue(_Fields field, Object value) { - switch (field) { - case MESSAGE: - if (value == null) { - unsetMessage(); - } else { - setMessage((String)value); - } - break; - - } - } - - public Object getFieldValue(_Fields field) { - switch (field) { - case MESSAGE: - return getMessage(); - - } - throw new IllegalStateException(); - } - - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ - public boolean isSet(_Fields field) { - if (field == null) { - throw new IllegalArgumentException(); - } - - switch (field) { - case MESSAGE: - return isSetMessage(); - } - throw new IllegalStateException(); - } - - @Override - public boolean equals(Object that) { - if (that == null) - return false; - if (that instanceof GatewayProfileServiceException) - return this.equals((GatewayProfileServiceException)that); - return false; - } - - public boolean equals(GatewayProfileServiceException that) { - if (that == null) - return false; - - boolean this_present_message = true && this.isSetMessage(); - boolean that_present_message = true && that.isSetMessage(); - if (this_present_message || that_present_message) { - if (!(this_present_message && that_present_message)) - return false; - if (!this.message.equals(that.message)) - return false; - } - - return true; - } - - @Override - public int hashCode() { - List<Object> list = new ArrayList<Object>(); - - boolean present_message = true && (isSetMessage()); - list.add(present_message); - if (present_message) - list.add(message); - - return list.hashCode(); - } - - @Override - public int compareTo(GatewayProfileServiceException other) { - if (!getClass().equals(other.getClass())) { - return getClass().getName().compareTo(other.getClass().getName()); - } - - int lastComparison = 0; - - lastComparison = Boolean.valueOf(isSetMessage()).compareTo(other.isSetMessage()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetMessage()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, other.message); - if (lastComparison != 0) { - return lastComparison; - } - } - return 0; - } - - public _Fields fieldForId(int fieldId) { - return _Fields.findByThriftId(fieldId); - } - - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - schemes.get(iprot.getScheme()).getScheme().read(iprot, this); - } - - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { - schemes.get(oprot.getScheme()).getScheme().write(oprot, this); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder("GatewayProfileServiceException("); - boolean first = true; - - sb.append("message:"); - if (this.message == null) { - sb.append("null"); - } else { - sb.append(this.message); - } - first = false; - sb.append(")"); - return sb.toString(); - } - - public void validate() throws org.apache.thrift.TException { - // check for required fields - if (message == null) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'message' was not present! Struct: " + toString()); - } - // check for sub-struct validity - } - - private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { - try { - write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift.TException te) { - throw new java.io.IOException(te); - } - } - - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { - try { - read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift.TException te) { - throw new java.io.IOException(te); - } - } - - private static class GatewayProfileServiceExceptionStandardSchemeFactory implements SchemeFactory { - public GatewayProfileServiceExceptionStandardScheme getScheme() { - return new GatewayProfileServiceExceptionStandardScheme(); - } - } - - private static class GatewayProfileServiceExceptionStandardScheme extends StandardScheme<GatewayProfileServiceException> { - - public void read(org.apache.thrift.protocol.TProtocol iprot, GatewayProfileServiceException struct) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField schemeField; - iprot.readStructBegin(); - while (true) - { - schemeField = iprot.readFieldBegin(); - if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { - break; - } - switch (schemeField.id) { - case 1: // MESSAGE - if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.message = iprot.readString(); - struct.setMessageIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - iprot.readFieldEnd(); - } - iprot.readStructEnd(); - - // check for required fields of primitive type, which can't be checked in the validate method - struct.validate(); - } - - public void write(org.apache.thrift.protocol.TProtocol oprot, GatewayProfileServiceException struct) throws org.apache.thrift.TException { - struct.validate(); - - oprot.writeStructBegin(STRUCT_DESC); - if (struct.message != null) { - oprot.writeFieldBegin(MESSAGE_FIELD_DESC); - oprot.writeString(struct.message); - oprot.writeFieldEnd(); - } - oprot.writeFieldStop(); - oprot.writeStructEnd(); - } - - } - - private static class GatewayProfileServiceExceptionTupleSchemeFactory implements SchemeFactory { - public GatewayProfileServiceExceptionTupleScheme getScheme() { - return new GatewayProfileServiceExceptionTupleScheme(); - } - } - - private static class GatewayProfileServiceExceptionTupleScheme extends TupleScheme<GatewayProfileServiceException> { - - @Override - public void write(org.apache.thrift.protocol.TProtocol prot, GatewayProfileServiceException struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - oprot.writeString(struct.message); - } - - @Override - public void read(org.apache.thrift.protocol.TProtocol prot, GatewayProfileServiceException struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - struct.message = iprot.readString(); - struct.setMessageIsSet(true); - } - } - -} -
http://git-wip-us.apache.org/repos/asf/airavata/blob/8e83408a/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/gateway/cpi/profile_gateway_cpiConstants.java ---------------------------------------------------------------------- diff --git a/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/gateway/cpi/profile_gateway_cpiConstants.java b/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/gateway/cpi/profile_gateway_cpiConstants.java deleted file mode 100644 index b5a9310..0000000 --- a/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/gateway/cpi/profile_gateway_cpiConstants.java +++ /dev/null @@ -1,59 +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. - */ -/** - * Autogenerated by Thrift Compiler (0.9.3) - * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * @generated - */ -package org.apache.airavata.service.profile.gateway.cpi; - -import org.apache.thrift.scheme.IScheme; -import org.apache.thrift.scheme.SchemeFactory; -import org.apache.thrift.scheme.StandardScheme; - -import org.apache.thrift.scheme.TupleScheme; -import org.apache.thrift.protocol.TTupleProtocol; -import org.apache.thrift.protocol.TProtocolException; -import org.apache.thrift.EncodingUtils; -import org.apache.thrift.TException; -import org.apache.thrift.async.AsyncMethodCallback; -import org.apache.thrift.server.AbstractNonblockingServer.*; -import java.util.List; -import java.util.ArrayList; -import java.util.Map; -import java.util.HashMap; -import java.util.EnumMap; -import java.util.Set; -import java.util.HashSet; -import java.util.EnumSet; -import java.util.Collections; -import java.util.BitSet; -import java.nio.ByteBuffer; -import java.util.Arrays; -import javax.annotation.Generated; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -public class profile_gateway_cpiConstants { - - public static final String GATEWAY_PROFILE_CPI_VERSION = "0.17"; - - public static final String GATEWAY_PROFILE_CPI_NAME = "GatewayProfileService"; - -} http://git-wip-us.apache.org/repos/asf/airavata/blob/8e83408a/airavata-services/profile-service/profile-tenant-core/src/main/java/org/apache/airavata/service/profile/tenant/core/impl/GatewayRegistry.java ---------------------------------------------------------------------- diff --git a/airavata-services/profile-service/profile-tenant-core/src/main/java/org/apache/airavata/service/profile/tenant/core/impl/GatewayRegistry.java b/airavata-services/profile-service/profile-tenant-core/src/main/java/org/apache/airavata/service/profile/tenant/core/impl/GatewayRegistry.java index 4b90452..160d8a7 100644 --- a/airavata-services/profile-service/profile-tenant-core/src/main/java/org/apache/airavata/service/profile/tenant/core/impl/GatewayRegistry.java +++ b/airavata-services/profile-service/profile-tenant-core/src/main/java/org/apache/airavata/service/profile/tenant/core/impl/GatewayRegistry.java @@ -141,19 +141,19 @@ public class GatewayRegistry { // public static void main(String args[]) { // Mapper mapper = ObjectMapperSingleton.getInstance(); // -// Gateway g = new Gateway(); +// GatewayEntity g = new GatewayEntity(); // g.setGatewayId("sd"); // g.setRequestCreationTime(1213232); // g.setGatewayApprovalStatus(GatewayApprovalStatus.ACTIVE); // System.out.println("T: " + g); // -// org.apache.airavata.service.profile.commons.tenant.entities.Gateway ge = new org.apache.airavata.service.profile.commons.tenant.entities.Gateway(); +// org.apache.airavata.service.profile.commons.tenant.entities.GatewayEntity ge = new org.apache.airavata.service.profile.commons.tenant.entities.GatewayEntity(); // ge.setGatewayId("ads"); // ge.setRequestCreationTime(new Date().getTime()); // ge.setGatewayApprovalStatus("ACTIVE"); // -// Class t = Gateway.class; -// Class e = org.apache.airavata.service.profile.commons.tenant.entities.Gateway.class; +// Class t = GatewayEntity.class; +// Class e = org.apache.airavata.service.profile.commons.tenant.entities.GatewayEntity.class; // Object o = mapper.map(ge, t); // System.out.println(o); // } http://git-wip-us.apache.org/repos/asf/airavata/blob/8e83408a/airavata-services/profile-service/profile-tenant-core/src/main/java/org/apache/airavata/service/profile/tenant/core/repositories/TenantProfileRepository.java ---------------------------------------------------------------------- diff --git a/airavata-services/profile-service/profile-tenant-core/src/main/java/org/apache/airavata/service/profile/tenant/core/repositories/TenantProfileRepository.java b/airavata-services/profile-service/profile-tenant-core/src/main/java/org/apache/airavata/service/profile/tenant/core/repositories/TenantProfileRepository.java new file mode 100644 index 0000000..f8d4b42 --- /dev/null +++ b/airavata-services/profile-service/profile-tenant-core/src/main/java/org/apache/airavata/service/profile/tenant/core/repositories/TenantProfileRepository.java @@ -0,0 +1,51 @@ +package org.apache.airavata.service.profile.tenant.core.repositories; + +import org.apache.airavata.model.workspace.Gateway; +import org.apache.airavata.service.profile.commons.repositories.AbstractRepository; +import org.apache.airavata.service.profile.commons.tenant.entities.GatewayEntity; +import org.apache.airavata.service.profile.commons.utils.QueryConstants; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by goshenoy on 3/8/17. + */ +public class TenantProfileRepository extends AbstractRepository<Gateway, GatewayEntity, String> { + + private final static Logger logger = LoggerFactory.getLogger(TenantProfileRepository.class); + + public TenantProfileRepository(Class<Gateway> thriftGenericClass, Class<GatewayEntity> dbEntityGenericClass) { + super(thriftGenericClass, dbEntityGenericClass); + } + + public Gateway getGateway (String gatewayId) throws Exception { + Gateway gateway = null; + try { + Map<String, Object> queryParam = new HashMap<String, Object>(); + queryParam.put(Gateway._Fields.GATEWAY_ID.getFieldName(), gatewayId); + List<Gateway> gatewayList = select(QueryConstants.FIND_GATEWAY_BY_ID, 1, 0, queryParam); + if (!gatewayList.isEmpty()) { + gateway = gatewayList.get(0); + } + } catch (Exception ex) { + logger.error("Error while getting gateway, reason: " + ex.getMessage(), ex); + throw ex; + } + return gateway; + } + + public List<Gateway> getAllGateways () throws Exception { + try { + List<Gateway> gatewayList = select(QueryConstants.GET_ALL_GATEWAYS); + return gatewayList; + } catch (Exception e){ + logger.error("Error while getting all the gateways, reason: ", e); + throw e; + } + } +} http://git-wip-us.apache.org/repos/asf/airavata/blob/8e83408a/airavata-services/profile-service/profile-tenant-core/src/main/java/org/apache/airavata/service/profile/tenant/core/util/GatewayUtils.java ---------------------------------------------------------------------- diff --git a/airavata-services/profile-service/profile-tenant-core/src/main/java/org/apache/airavata/service/profile/tenant/core/util/GatewayUtils.java b/airavata-services/profile-service/profile-tenant-core/src/main/java/org/apache/airavata/service/profile/tenant/core/util/GatewayUtils.java index a097685..c9524f0 100644 --- a/airavata-services/profile-service/profile-tenant-core/src/main/java/org/apache/airavata/service/profile/tenant/core/util/GatewayUtils.java +++ b/airavata-services/profile-service/profile-tenant-core/src/main/java/org/apache/airavata/service/profile/tenant/core/util/GatewayUtils.java @@ -40,7 +40,7 @@ public class GatewayUtils { private final static Logger logger = LoggerFactory.getLogger(GatewayUtils.class); /** - * This method converts Gateway object to GatewayResource + * This method converts GatewayEntity object to GatewayResource * @param gateway * @return */ @@ -50,7 +50,7 @@ public class GatewayUtils { } /** - * This method converts Gateway object to GatewayResource + * This method converts GatewayEntity object to GatewayResource * @param gatewayResource * @param gateway * @return @@ -77,13 +77,13 @@ public class GatewayUtils { gatewayResource.setRequesterUsername(gateway.getRequesterUsername()); gatewayResource.setOauthClientSecret(gateway.getGetOauthClientSecret()); } else { - throw new Exception("Could not get GatewayResource object because Gateway object is null"); + throw new Exception("Could not get GatewayResource object because GatewayEntity object is null"); } return gatewayResource; } /** - * This method converts GatewayResource to Gateway + * This method converts GatewayResource to GatewayEntity * @param resource * @return */ http://git-wip-us.apache.org/repos/asf/airavata/blob/8e83408a/airavata-services/profile-service/profile-tenant-core/src/main/java/org/apache/airavata/service/profile/tenant/core/util/QueryConstants.java ---------------------------------------------------------------------- diff --git a/airavata-services/profile-service/profile-tenant-core/src/main/java/org/apache/airavata/service/profile/tenant/core/util/QueryConstants.java b/airavata-services/profile-service/profile-tenant-core/src/main/java/org/apache/airavata/service/profile/tenant/core/util/QueryConstants.java index 44f6ee8..27eed48 100644 --- a/airavata-services/profile-service/profile-tenant-core/src/main/java/org/apache/airavata/service/profile/tenant/core/util/QueryConstants.java +++ b/airavata-services/profile-service/profile-tenant-core/src/main/java/org/apache/airavata/service/profile/tenant/core/util/QueryConstants.java @@ -7,9 +7,9 @@ import org.apache.airavata.model.user.UserProfile; */ public class QueryConstants { - public static final String FIND_GATEWAY_BY_ID = "SELECT g FROM Gateway g where g.gatewayId='{0}'"; + public static final String FIND_GATEWAY_BY_ID = "SELECT g FROM GatewayEntity g where g.gatewayId='{0}'"; - public static final String GET_ALL_GATEWAYS = "SELECT g FROM Gateway g"; + public static final String GET_ALL_GATEWAYS = "SELECT g FROM GatewayEntity g"; - public static final String DELETE_GATEWAY_BY_ID = "DELETE FROM Gateway g where g.gatewayId='{0}'"; + public static final String DELETE_GATEWAY_BY_ID = "DELETE FROM GatewayEntity g where g.gatewayId='{0}'"; } http://git-wip-us.apache.org/repos/asf/airavata/blob/8e83408a/airavata-services/profile-service/profile-user-core/src/test/java/org/apache/airavata/registry/core/repositories/WorkspaceRepositoryTest.java ---------------------------------------------------------------------- diff --git a/airavata-services/profile-service/profile-user-core/src/test/java/org/apache/airavata/registry/core/repositories/WorkspaceRepositoryTest.java b/airavata-services/profile-service/profile-user-core/src/test/java/org/apache/airavata/registry/core/repositories/WorkspaceRepositoryTest.java index 67ba550..0be6fde 100644 --- a/airavata-services/profile-service/profile-user-core/src/test/java/org/apache/airavata/registry/core/repositories/WorkspaceRepositoryTest.java +++ b/airavata-services/profile-service/profile-user-core/src/test/java/org/apache/airavata/registry/core/repositories/WorkspaceRepositoryTest.java @@ -41,7 +41,7 @@ public class WorkspaceRepositoryTest { // @Before // public void setupRepository() { // -// gatewayRepository = new GatewayRepository(Gateway.class, GatewayEntity.class); +// gatewayRepository = new GatewayRepository(GatewayEntity.class, GatewayEntity.class); // notificationRepository = new NotificationRepository(Notification.class, // NotificationEntity.class); // userProfileRepository = new UserProfileRepository(UserProfile.class, UserProfileEntity.class); @@ -57,9 +57,9 @@ public class WorkspaceRepositoryTest { // public void userProfileRepositoryTest() { // // /* -// * Creating Gateway required for UserProfile creation +// * Creating GatewayEntity required for UserProfile creation // */ -// Gateway gateway = new Gateway(); +// GatewayEntity gateway = new GatewayEntity(); // gateway.setGatewayApprovalStatus(GatewayApprovalStatus.ACTIVE); // gateway.setGatewayId(gatewayId); // gateway.setDomain(GATEWAY_DOMAIN); @@ -111,9 +111,9 @@ public class WorkspaceRepositoryTest { // public void projectRepositoryTest() { // // /* -// * Creating Gateway required for UserProfile & Project creation +// * Creating GatewayEntity required for UserProfile & Project creation // */ -// Gateway gateway = new Gateway(); +// GatewayEntity gateway = new GatewayEntity(); // gateway.setGatewayApprovalStatus(GatewayApprovalStatus.ACTIVE); // gateway.setGatewayId(gatewayId); // gateway.setDomain(GATEWAY_DOMAIN);
