http://git-wip-us.apache.org/repos/asf/airavata/blob/801489bf/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/QosParam.java ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/QosParam.java b/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/QosParam.java deleted file mode 100644 index a0dbfa0..0000000 --- a/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/QosParam.java +++ /dev/null @@ -1,119 +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.persistance.registry.jpa.model; - -import org.apache.openjpa.persistence.DataCache; - -import javax.persistence.*; -import java.io.Serializable; - -@DataCache -@Entity -@Table(name = "QOS_PARAMS") -public class QosParam implements Serializable { - @Id - @GeneratedValue - @Column(name = "QOS_ID") - private int qosId; - @Column(name = "EXPERIMENT_ID") - private String expId; - @Column(name = "TASK_ID") - private String taskId; - @Column(name = "START_EXECUTION_AT") - private String startExecutionAt; - @Column(name = "EXECUTE_BEFORE") - private String executeBefore; - @Column(name = "NO_OF_RETRIES") - private int noOfRetries; - - @ManyToOne(cascade= CascadeType.MERGE) - @JoinColumn(name = "EXPERIMENT_ID") - private Experiment experiment; - - @ManyToOne(cascade= CascadeType.MERGE) - @JoinColumn(name = "TASK_ID") - private TaskDetail task; - - public int getQosId() { - return qosId; - } - - public void setQosId(int qosId) { - this.qosId = qosId; - } - - public String getExpId() { - return expId; - } - - public void setExpId(String expId) { - this.expId = expId; - } - - public String getTaskId() { - return taskId; - } - - public void setTaskId(String taskId) { - this.taskId = taskId; - } - - public String getStartExecutionAt() { - return startExecutionAt; - } - - public void setStartExecutionAt(String startExecutionAt) { - this.startExecutionAt = startExecutionAt; - } - - public String getExecuteBefore() { - return executeBefore; - } - - public void setExecuteBefore(String executeBefore) { - this.executeBefore = executeBefore; - } - - public int getNoOfRetries() { - return noOfRetries; - } - - public void setNoOfRetries(int noOfRetries) { - this.noOfRetries = noOfRetries; - } - - public Experiment getExperiment() { - return experiment; - } - - public void setExperiment(Experiment experiment) { - this.experiment = experiment; - } - - public TaskDetail getTask() { - return task; - } - - public void setTask(TaskDetail task) { - this.task = task; - } -}
http://git-wip-us.apache.org/repos/asf/airavata/blob/801489bf/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Status.java ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Status.java b/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Status.java deleted file mode 100644 index 4783af5..0000000 --- a/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Status.java +++ /dev/null @@ -1,174 +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.persistance.registry.jpa.model; - -import org.apache.openjpa.persistence.DataCache; - -import javax.persistence.*; -import java.io.Serializable; -import java.sql.Timestamp; - -@DataCache -@Entity -@Table(name = "STATUS") -public class Status implements Serializable { - @Id - @GeneratedValue - @Column(name = "STATUS_ID") - private int statusId; - @Column(name = "EXPERIMENT_ID") - private String expId; - @Column(name = "NODE_INSTANCE_ID") - private String nodeId; - @Column(name = "TRANSFER_ID") - private String transferId; - @Column(name = "TASK_ID") - private String taskId; - @Column(name = "JOB_ID") - private String jobId; - @Column(name = "STATE") - private String state; - @Column(name = "STATUS_UPDATE_TIME") - private Timestamp statusUpdateTime; - @Column(name = "STATUS_TYPE") - private String statusType; - - @ManyToOne(cascade= CascadeType.MERGE) - @JoinColumn(name = "EXPERIMENT_ID") - private Experiment experiment; - - @ManyToOne(cascade= CascadeType.MERGE) - @JoinColumn(name = "TASK_ID") - private TaskDetail task; - - @ManyToOne(cascade= CascadeType.MERGE) - @JoinColumn(name = "NODE_INSTANCE_ID") - private WorkflowNodeDetail node; - - @ManyToOne(cascade= CascadeType.MERGE) - @JoinColumn(name = "TRANSFER_ID") - private DataTransferDetail transferDetail; - - public int getStatusId() { - return statusId; - } - - public void setStatusId(int statusId) { - this.statusId = statusId; - } - - public String getExpId() { - return expId; - } - - public void setExpId(String expId) { - this.expId = expId; - } - - public String getNodeId() { - return nodeId; - } - - public void setNodeId(String nodeId) { - this.nodeId = nodeId; - } - - public String getTransferId() { - return transferId; - } - - public void setTransferId(String transferId) { - this.transferId = transferId; - } - - public String getTaskId() { - return taskId; - } - - public void setTaskId(String taskId) { - this.taskId = taskId; - } - - public String getJobId() { - return jobId; - } - - public void setJobId(String jobId) { - this.jobId = jobId; - } - - public String getState() { - return state; - } - - public void setState(String state) { - this.state = state; - } - - public Timestamp getStatusUpdateTime() { - return statusUpdateTime; - } - - public void setStatusUpdateTime(Timestamp statusUpdateTime) { - this.statusUpdateTime = statusUpdateTime; - } - - public String getStatusType() { - return statusType; - } - - public void setStatusType(String statusType) { - this.statusType = statusType; - } - - public Experiment getExperiment() { - return experiment; - } - - public void setExperiment(Experiment experiment) { - this.experiment = experiment; - } - - public TaskDetail getTask() { - return task; - } - - public void setTask(TaskDetail task) { - this.task = task; - } - - public WorkflowNodeDetail getNode() { - return node; - } - - public void setNode(WorkflowNodeDetail node) { - this.node = node; - } - - public DataTransferDetail getTransferDetail() { - return transferDetail; - } - - public void setTransferDetail(DataTransferDetail transferDetail) { - this.transferDetail = transferDetail; - } -} http://git-wip-us.apache.org/repos/asf/airavata/blob/801489bf/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/TaskDetail.java ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/TaskDetail.java b/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/TaskDetail.java deleted file mode 100644 index ebd7758..0000000 --- a/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/TaskDetail.java +++ /dev/null @@ -1,119 +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.persistance.registry.jpa.model; - -import org.apache.openjpa.persistence.DataCache; - -import javax.persistence.*; - -import java.io.Serializable; -import java.sql.Timestamp; - -@DataCache -@Entity -@Table(name = "TASK_DETAIL") -public class TaskDetail implements Serializable { - @Id - @Column(name = "TASK_ID") - private String taskId; - @Column(name = "NODE_INSTANCE_ID") - private String nodeId; - @Column(name = "CREATION_TIME") - private Timestamp creationTime; - @Column(name = "APPLICATION_ID") - private String appId; - @Column(name = "APPLICATION_VERSION") - private String appVersion; - @Column(name = "ALLOW_NOTIFICATION") - private boolean allowNotification; - - @Column(name = "APPLICATION_DEPLOYMENT_ID") - private String applicationDeploymentId; - - @ManyToOne(cascade= CascadeType.MERGE) - @JoinColumn(name = "NODE_INSTANCE_ID") - private WorkflowNodeDetail nodeDetail; - - public String getTaskId() { - return taskId; - } - - public void setTaskId(String taskId) { - this.taskId = taskId; - } - - public String getNodeId() { - return nodeId; - } - - public void setNodeId(String nodeId) { - this.nodeId = nodeId; - } - - public Timestamp getCreationTime() { - return creationTime; - } - - public void setCreationTime(Timestamp creationTime) { - this.creationTime = creationTime; - } - - public String getAppId() { - return appId; - } - - public void setAppId(String appId) { - this.appId = appId; - } - - public String getAppVersion() { - return appVersion; - } - - public void setAppVersion(String appVersion) { - this.appVersion = appVersion; - } - - public WorkflowNodeDetail getNodeDetail() { - return nodeDetail; - } - - public void setNodeDetail(WorkflowNodeDetail nodeDetail) { - this.nodeDetail = nodeDetail; - } - - public String getApplicationDeploymentId() { - return applicationDeploymentId; - } - - public void setApplicationDeploymentId(String applicationDeploymentId) { - this.applicationDeploymentId = applicationDeploymentId; - } - - public boolean isAllowNotification() { - return allowNotification; - } - - public void setAllowNotification(boolean allowNotification) { - this.allowNotification = allowNotification; - } -} http://git-wip-us.apache.org/repos/asf/airavata/blob/801489bf/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Users.java ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Users.java b/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Users.java deleted file mode 100644 index 9005985..0000000 --- a/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Users.java +++ /dev/null @@ -1,55 +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.persistance.registry.jpa.model; - -import org.apache.openjpa.persistence.DataCache; - -import javax.persistence.*; -import java.io.Serializable; - -@DataCache -@Entity -@Table(name ="USERS") -public class Users implements Serializable { - - @Id - @Column(name = "USER_NAME") - private String user_name; - @Column(name = "PASSWORD") - private String password; - - - public String getUser_name() { - return user_name; - } - - public void setUser_name(String user_name) { - this.user_name = user_name; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } -} http://git-wip-us.apache.org/repos/asf/airavata/blob/801489bf/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/WorkflowNodeDetail.java ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/WorkflowNodeDetail.java b/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/WorkflowNodeDetail.java deleted file mode 100644 index b4ae29e..0000000 --- a/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/WorkflowNodeDetail.java +++ /dev/null @@ -1,107 +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.persistance.registry.jpa.model; - -import org.apache.openjpa.persistence.DataCache; - -import javax.persistence.*; -import java.io.Serializable; -import java.sql.Timestamp; - -@DataCache -@Entity -@Table(name = "WORKFLOW_NODE_DETAIL") -public class WorkflowNodeDetail implements Serializable { - @Column(name = "EXPERIMENT_ID") - private String expId; - @Id - @Column(name = "NODE_INSTANCE_ID") - private String nodeId; - @Column(name = "EXECUTION_UNIT") - private String executionUnit; - @Column(name = "EXECUTION_UNIT_DATA") - private String executionUnitData; - @Column(name = "CREATION_TIME") - private Timestamp creationTime; - @Column(name = "NODE_NAME") - private String nodeName; - - @ManyToOne(cascade= CascadeType.MERGE) - @JoinColumn(name = "EXPERIMENT_ID") - private Experiment experiment; - - public String getExpId() { - return expId; - } - - public void setExpId(String expId) { - this.expId = expId; - } - - public String getNodeId() { - return nodeId; - } - - public void setNodeId(String nodeId) { - this.nodeId = nodeId; - } - - public Timestamp getCreationTime() { - return creationTime; - } - - public void setCreationTime(Timestamp creationTime) { - this.creationTime = creationTime; - } - - public String getNodeName() { - return nodeName; - } - - public void setNodeName(String nodeName) { - this.nodeName = nodeName; - } - - public Experiment getExperiment() { - return experiment; - } - - public void setExperiment(Experiment experiment) { - this.experiment = experiment; - } - - public String getExecutionUnitData() { - return executionUnitData; - } - - public void setExecutionUnitData(String executionUnitData) { - this.executionUnitData = executionUnitData; - } - - public String getExecutionUnit() { - return executionUnit; - } - - public void setExecutionUnit(String executionUnit) { - this.executionUnit = executionUnit; - } -} http://git-wip-us.apache.org/repos/asf/airavata/blob/801489bf/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/ExperimentRegistry.java ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/ExperimentRegistry.java b/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/ExperimentRegistry.java deleted file mode 100644 index 515218d..0000000 --- a/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/ExperimentRegistry.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.persistance.registry.jpa.mongo; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class ExperimentRegistry { - private final static Logger logger = LoggerFactory.getLogger(ExperimentRegistry.class); -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata/blob/801489bf/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/Test.java ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/Test.java b/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/Test.java deleted file mode 100644 index 4e04940..0000000 --- a/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/Test.java +++ /dev/null @@ -1,79 +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.persistance.registry.jpa.mongo; - -import org.apache.airavata.model.workspace.experiment.Experiment; -import org.apache.airavata.persistance.registry.jpa.impl.RegistryFactory; -import org.apache.airavata.persistance.registry.jpa.mongo.dao.ExperimentDao; -import org.apache.airavata.persistance.registry.jpa.mongo.utils.MongoUtil; -import org.apache.airavata.registry.cpi.Registry; -import org.apache.airavata.registry.cpi.RegistryException; -import org.apache.airavata.registry.cpi.RegistryModelType; -import org.junit.Assert; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.BufferedReader; -import java.io.FileReader; -import java.io.IOException; - -public class Test { - private final static Logger logger = LoggerFactory.getLogger(Test.class); - - public static void main(String[] args) throws RegistryException, IOException { - Registry registry = RegistryFactory.getDefaultRegistry(); -// String experiemtnId = "SLM-Espresso-Stampede_45667ea8-aae3-4a8e-807d-a16312035c35"; -// long time1 = System.currentTimeMillis(); -// Experiment experiement = (Experiment) registry.getExperiment(RegistryModelType.EXPERIMENT, experiemtnId); -// long time2 = System.currentTimeMillis(); -// System.out.println(time2-time1); -// -// ExperimentDao experimentDao = new ExperimentDao(); -// experimentDao.createExperiment(experiement); -// time1 = System.currentTimeMillis(); -// Experiment persistedExperiment = experimentDao.getExperiment(experiement.getExperimentId()); -// time2 = System.currentTimeMillis(); -// System.out.println(time2-time1); -// -// Assert.assertEquals(experiement, persistedExperiment); - - MongoUtil.dropAiravataRegistry(); - - ExperimentDao experimentDao = new ExperimentDao(); - BufferedReader reader = new BufferedReader(new FileReader("/home/supun/Downloads/EXPERIMENT.csv")); - String temp = reader.readLine(); - int i = 1; - while(temp != null && !temp.isEmpty()){ - try{ - Experiment experiement = (Experiment) registry.get(RegistryModelType.EXPERIMENT, temp.trim()); - experimentDao.createExperiment(experiement); - Experiment persistedExperiment = experimentDao.getExperiment(experiement.getExperimentId()); - Assert.assertEquals(experiement, persistedExperiment); - System.out.println(i+" :"+experiement.getExperimentId()); - i++; - }catch (Exception e){ - System.out.println(temp); - e.printStackTrace(); - } - temp = reader.readLine(); - } - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata/blob/801489bf/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/AbstractThriftDeserializer.java ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/AbstractThriftDeserializer.java b/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/AbstractThriftDeserializer.java deleted file mode 100644 index ba597ee..0000000 --- a/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/AbstractThriftDeserializer.java +++ /dev/null @@ -1,152 +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.persistance.registry.jpa.mongo.conversion; - -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.*; -import com.fasterxml.jackson.databind.node.JsonNodeType; -import com.fasterxml.jackson.databind.node.ObjectNode; -import com.fasterxml.jackson.databind.type.TypeFactory; -import com.google.common.base.CaseFormat; -import org.apache.thrift.TBase; -import org.apache.thrift.TException; -import org.apache.thrift.TFieldIdEnum; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.IOException; -import java.lang.reflect.Field; -import java.lang.reflect.ParameterizedType; -import java.util.Iterator; -import java.util.Map; - -/** - * This abstract class represents a generic de-serializer for converting JSON to Thrift-based entities. - * - * @param <E> An implementation of the {@link org.apache.thrift.TFieldIdEnum} interface. - * @param <T> An implementation of the {@link org.apache.thrift.TBase} interface. - */ -public abstract class AbstractThriftDeserializer<E extends TFieldIdEnum, T extends TBase<T, E>> extends JsonDeserializer<T> { - - private static Logger log = LoggerFactory.getLogger(AbstractThriftDeserializer.class); - - @Override - public T deserialize(final JsonParser jp, final DeserializationContext ctxt) throws IOException, JsonProcessingException { - final T instance = newInstance(); - final ObjectMapper mapper = (ObjectMapper)jp.getCodec(); - final ObjectNode rootNode = (ObjectNode)mapper.readTree(jp); - final Iterator<Map.Entry<String, JsonNode>> iterator = rootNode.fields(); - - while(iterator.hasNext()) { - final Map.Entry<String, JsonNode> currentField = iterator.next(); - try { - /* - * If the current node is not a null value, process it. Otherwise, - * skip it. Jackson will treat the null as a 0 for primitive - * number types, which in turn will make Thrift think the field - * has been set. Also we ignore the MongoDB specific _id field - */ - if(!currentField.getKey().equalsIgnoreCase("_id") - && currentField.getValue().getNodeType() != JsonNodeType.NULL) { - final E field = getField(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.UPPER_UNDERSCORE, currentField.getKey())); - final JsonParser parser = currentField.getValue().traverse(); - parser.setCodec(mapper); - final Object value = mapper.readValue(parser, generateValueType(instance, field)); - if(value != null) { - log.debug(String.format("Field %s produced value %s of type %s.", - currentField.getKey(), value, value.getClass().getName())); - instance.setFieldValue(field, value); - } else { - log.debug("Field {} contains a null value. Skipping...", currentField.getKey()); - } - } else { - log.debug("Field {} contains a null value. Skipping...", currentField.getKey()); - } - } catch (final NoSuchFieldException | IllegalArgumentException e) { - log.error("Unable to de-serialize field '{}'.", currentField.getKey(), e); - ctxt.mappingException(e.getMessage()); - } - } - - try { - // Validate that the instance contains all required fields. - validate(instance); - } catch (final TException e) { - log.error(String.format("Unable to deserialize JSON '%s' to type '%s'.", - jp.getValueAsString(), instance.getClass().getName(), e)); - ctxt.mappingException(e.getMessage()); - } - - return instance; - } - - /** - * Returns the {@code <E>} enumerated value that represents the target - * field in the Thrift entity referenced in the JSON document. - * @param fieldName The name of the Thrift entity target field. - * @return The {@code <E>} enumerated value that represents the target - * field in the Thrift entity referenced in the JSON document. - */ - protected abstract E getField(String fieldName); - - /** - * Creates a new instance of the Thrift entity class represented by this deserializer. - * @return A new instance of the Thrift entity class represented by this deserializer. - */ - protected abstract T newInstance(); - - /** - * Validates that the Thrift entity instance contains all required fields after deserialization. - * @param instance A Thrift entity instance. - * @throws org.apache.thrift.TException if unable to validate the instance. - */ - protected abstract void validate(T instance) throws TException; - - /** - * Generates a {@link JavaType} that matches the target Thrift field represented by the provided - * {@code <E>} enumerated value. If the field's type includes generics, the generics will - * be added to the generated {@link JavaType} to support proper conversion. - * @param thriftInstance The Thrift-generated class instance that will be converted to/from JSON. - * @param field A {@code <E>} enumerated value that represents a field in a Thrift-based entity. - * @return The {@link JavaType} representation of the type associated with the field. - * @throws NoSuchFieldException if unable to determine the field's type. - * @throws SecurityException if unable to determine the field's type. - */ - protected JavaType generateValueType(final T thriftInstance, final E field) throws NoSuchFieldException, SecurityException { - final TypeFactory typeFactory = TypeFactory.defaultInstance(); - - final Field declaredField = thriftInstance.getClass().getDeclaredField(field.getFieldName()); - if(declaredField.getType().equals(declaredField.getGenericType())) { - log.debug("Generating JavaType for type '{}'.", declaredField.getType()); - return typeFactory.constructType(declaredField.getType()); - } else { - final ParameterizedType type = (ParameterizedType)declaredField.getGenericType(); - final Class<?>[] parameterizedTypes = new Class<?>[type.getActualTypeArguments().length]; - for(int i=0; i<type.getActualTypeArguments().length; i++) { - parameterizedTypes[i] = (Class<?>)type.getActualTypeArguments()[i]; - } - log.debug("Generating JavaType for type '{}' with generics '{}'", declaredField.getType(), parameterizedTypes); - return typeFactory.constructParametricType(declaredField.getType(), parameterizedTypes); - } - } - -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata/blob/801489bf/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/AbstractThriftSerializer.java ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/AbstractThriftSerializer.java b/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/AbstractThriftSerializer.java deleted file mode 100644 index c692beb..0000000 --- a/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/AbstractThriftSerializer.java +++ /dev/null @@ -1,122 +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.persistance.registry.jpa.mongo.conversion; - -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.JsonSerializer; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.google.common.base.CaseFormat; -import org.apache.thrift.TBase; -import org.apache.thrift.TFieldIdEnum; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.IOException; -import java.util.Collection; - -/** - * This abstract class represents a generic serializer for converting Thrift-based entities - * to JSON. - * - * @param <E> An implementation of the {@link org.apache.thrift.TFieldIdEnum} interface. - * @param <T> An implementation of the {@link org.apache.thrift.TBase} interface. - */ -public abstract class AbstractThriftSerializer<E extends TFieldIdEnum, T extends TBase<T, E>> - extends JsonSerializer<T> { - - private static final Logger log = LoggerFactory.getLogger(AbstractThriftSerializer.class); - - @Override - public Class<T> handledType() { - return getThriftClass(); - } - - @Override - public void serialize(final T value, final JsonGenerator jgen, final SerializerProvider provider) - throws IOException, JsonProcessingException { - jgen.writeStartObject(); - for(final E field : getFieldValues()) { - if(value.isSet(field)) { - final Object fieldValue = value.getFieldValue(field); - if(fieldValue != null) { - log.debug("Adding field {} to the JSON string...", - CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE,field.getFieldName()) - ); - - jgen.writeFieldName(CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE,field.getFieldName())); - if(fieldValue instanceof Short) { - jgen.writeNumber((Short)fieldValue); - } else if(fieldValue instanceof Integer) { - jgen.writeNumber((Integer)fieldValue); - } else if(fieldValue instanceof Long) { - jgen.writeNumber((Long)fieldValue); - } else if(fieldValue instanceof Double) { - jgen.writeNumber((Double)fieldValue); - } else if(fieldValue instanceof Float) { - jgen.writeNumber((Float)fieldValue); - } else if(fieldValue instanceof Boolean) { - jgen.writeBoolean((Boolean)fieldValue); - } else if(fieldValue instanceof String) { - jgen.writeString(fieldValue.toString()); - } else if(fieldValue instanceof Collection) { - log.debug("Array opened for field {}.", - CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE,field.getFieldName()) - ); - jgen.writeStartArray(); - for(final Object arrayObject : (Collection<?>)fieldValue) { - jgen.writeObject(arrayObject); - } - jgen.writeEndArray(); - log.debug("Array closed for field {}.", - CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE,field.getFieldName()) - ); - } else { - jgen.writeObject(fieldValue); - } - } else { - log.debug("Skipping converting field {} to JSON: value is null!", - CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE,field.getFieldName()) - ); - } - } else { - log.debug("Skipping converting field {} to JSON: field has not been set!", - CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE,field.getFieldName()) - ); - } - } - jgen.writeEndObject(); - } - - /** - * Returns an array of {@code <E>} enumerated values that represent the fields present in the - * Thrift class associated with this serializer. - * @return The array of {@code <E>} enumerated values that represent the fields present in the - * Thrift class. - */ - protected abstract E[] getFieldValues(); - - /** - * Returns the {@code <T>} implementation class associated with this serializer. - * @return The {@code <T>} implementation class - */ - protected abstract Class<T> getThriftClass(); -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata/blob/801489bf/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/ModelConversionHelper.java ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/ModelConversionHelper.java b/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/ModelConversionHelper.java deleted file mode 100644 index 4144b2e..0000000 --- a/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/ModelConversionHelper.java +++ /dev/null @@ -1,218 +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.persistance.registry.jpa.mongo.conversion; - -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.Version; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.module.SimpleModule; -import org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType; -import org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType; -import org.apache.airavata.model.workspace.Gateway; -import org.apache.airavata.model.workspace.Group; -import org.apache.airavata.model.workspace.Project; -import org.apache.airavata.model.workspace.User; -import org.apache.airavata.model.workspace.experiment.*; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.appcatalog.idot.InputDataObjectTypeDeserializer; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.appcatalog.idot.InputDataObjectTypeSerializer; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.appcatalog.odot.OutputDataObjectTypeDeserializer; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.appcatalog.odot.OutputDataObjectTypeSerializer; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.experiment.ExperimentDeserializer; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.experiment.ExperimentSerializer; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.experiment.aidh.AdvancedInputDataHandlingDeserializer; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.experiment.aidh.AdvancedInputDataHandlingSerializer; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.experiment.aodh.AdvancedOutputDataHandlingDeserializer; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.experiment.aodh.AdvancedOutputDataHandlingSerializer; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.experiment.appstatus.ApplicationStatusDeserializer; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.experiment.appstatus.ApplicationStatusSerializer; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.experiment.crsh.ComputationalResourceSchedulingDeserializer; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.experiment.crsh.ComputationalResourceSchedulingSerializer; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.experiment.datatrdetails.DataTransferDetailsDeserializer; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.experiment.datatrdetails.DataTransferDetailsSerializer; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.experiment.errdetails.ErrorDetailsDeserializer; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.experiment.errdetails.ErrorDetailsSerializer; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.experiment.expstatus.ExperimentStatusDeserializer; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.experiment.expstatus.ExperimentStatusSerializer; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.experiment.expsummary.ExperimentSummaryDeserializer; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.experiment.expsummary.ExperimentSummarySerializer; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.experiment.jobdetails.JobDetailsDeserializer; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.experiment.jobdetails.JobDetailsSerializer; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.experiment.jobstatus.JobStatusDeserializer; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.experiment.jobstatus.JobStatusSerializer; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.experiment.qosp.QualityOfServiceParamsDeserializer; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.experiment.qosp.QualityOfServiceParamsSerializer; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.experiment.taskdetails.TaskDetailsDeserializer; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.experiment.taskdetails.TaskDetailsSerializer; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.experiment.taskstatus.TaskStatusDeserializer; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.experiment.taskstatus.TaskStatusSerializer; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.experiment.trstatus.TransferStatusDeserializer; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.experiment.trstatus.TransferStatusSerializer; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.experiment.ucdata.UserConfigurationDataDeserializer; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.experiment.ucdata.UserConfigurationDataSerializer; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.experiment.validationrslt.ValidationResultsDeserializer; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.experiment.validationrslt.ValidationResultsSerializer; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.experiment.wfnd.WorkflowNodeDetailsDeserializer; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.experiment.wfnd.WorkflowNodeDetailsSerializer; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.experiment.wfns.WorkflowNodeStatusDeserializer; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.experiment.wfns.WorkflowNodeStatusSerializer; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.gateway.GatewayDeserializer; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.gateway.GatewaySerializer; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.group.GroupDeserializer; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.group.GroupSerializer; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.project.ProjectDeserializer; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.project.ProjectSerializer; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.user.UserDeserializer; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.user.UserSerializer; -import org.apache.thrift.TBase; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.IOException; - -/** - * This is utility class for model conversion of thrift to/from json - */ -public class ModelConversionHelper { - private final static Logger logger = LoggerFactory.getLogger(ModelConversionHelper.class); - private ObjectMapper objectMapper; - - public ModelConversionHelper(){ - init(); - } - - /** - * Private method to register the custom serializers and deserializers - */ - private void init(){ - this.objectMapper = new ObjectMapper(); - SimpleModule module = new SimpleModule("SimpleModule", - new Version(1,0,0,null,null,null)); - - module.addSerializer(Gateway.class, new GatewaySerializer()); - module.addDeserializer(Gateway.class, new GatewayDeserializer()); - - module.addSerializer(Group.class, new GroupSerializer()); - module.addDeserializer(Group.class, new GroupDeserializer()); - - module.addSerializer(Project.class, new ProjectSerializer()); - module.addDeserializer(Project.class, new ProjectDeserializer()); - - module.addSerializer(User.class, new UserSerializer()); - module.addDeserializer(User.class, new UserDeserializer()); - - module.addSerializer(Experiment.class, new ExperimentSerializer()); - module.addDeserializer(Experiment.class, new ExperimentDeserializer()); - - module.addSerializer(AdvancedInputDataHandling.class, - new AdvancedInputDataHandlingSerializer()); - module.addDeserializer(AdvancedInputDataHandling.class, - new AdvancedInputDataHandlingDeserializer()); - - module.addSerializer(AdvancedOutputDataHandling.class, - new AdvancedOutputDataHandlingSerializer()); - module.addDeserializer(AdvancedOutputDataHandling.class, - new AdvancedOutputDataHandlingDeserializer()); - - module.addSerializer(ApplicationStatus.class, - new ApplicationStatusSerializer()); - module.addDeserializer(ApplicationStatus.class, - new ApplicationStatusDeserializer()); - - module.addSerializer(ComputationalResourceScheduling.class, - new ComputationalResourceSchedulingSerializer()); - module.addDeserializer(ComputationalResourceScheduling.class, - new ComputationalResourceSchedulingDeserializer()); - - module.addSerializer(DataTransferDetails.class, new DataTransferDetailsSerializer()); - module.addDeserializer(DataTransferDetails.class, new DataTransferDetailsDeserializer()); - - module.addSerializer(ErrorDetails.class, new ErrorDetailsSerializer()); - module.addDeserializer(ErrorDetails.class, new ErrorDetailsDeserializer()); - - module.addSerializer(ExperimentStatus.class, new ExperimentStatusSerializer()); - module.addDeserializer(ExperimentStatus.class, new ExperimentStatusDeserializer()); - - module.addSerializer(ExperimentSummary.class, new ExperimentSummarySerializer()); - module.addDeserializer(ExperimentSummary.class, new ExperimentSummaryDeserializer()); - - module.addSerializer(JobDetails.class, new JobDetailsSerializer()); - module.addDeserializer(JobDetails.class, new JobDetailsDeserializer()); - - module.addSerializer(JobStatus.class, new JobStatusSerializer()); - module.addDeserializer(JobStatus.class, new JobStatusDeserializer()); - - module.addSerializer(QualityOfServiceParams.class, - new QualityOfServiceParamsSerializer()); - module.addDeserializer(QualityOfServiceParams.class, - new QualityOfServiceParamsDeserializer()); - - module.addSerializer(TaskDetails.class, new TaskDetailsSerializer()); - module.addDeserializer(TaskDetails.class, new TaskDetailsDeserializer()); - - module.addSerializer(TaskStatus.class, new TaskStatusSerializer()); - module.addDeserializer(TaskStatus.class, new TaskStatusDeserializer()); - - module.addSerializer(TransferStatus.class, new TransferStatusSerializer()); - module.addDeserializer(TransferStatus.class, new TransferStatusDeserializer()); - - module.addSerializer(UserConfigurationData.class, new UserConfigurationDataSerializer()); - module.addDeserializer(UserConfigurationData.class, new UserConfigurationDataDeserializer()); - - module.addSerializer(ValidationResults.class, new ValidationResultsSerializer()); - module.addDeserializer(ValidationResults.class, new ValidationResultsDeserializer()); - - module.addSerializer(WorkflowNodeDetails.class, new WorkflowNodeDetailsSerializer()); - module.addDeserializer(WorkflowNodeDetails.class, new WorkflowNodeDetailsDeserializer()); - - module.addSerializer(WorkflowNodeStatus.class, new WorkflowNodeStatusSerializer()); - module.addDeserializer(WorkflowNodeStatus.class, new WorkflowNodeStatusDeserializer()); - - module.addSerializer(InputDataObjectType.class, new InputDataObjectTypeSerializer()); - module.addDeserializer(InputDataObjectType.class, new InputDataObjectTypeDeserializer()); - - module.addSerializer(OutputDataObjectType.class, new OutputDataObjectTypeSerializer()); - module.addDeserializer(OutputDataObjectType.class, new OutputDataObjectTypeDeserializer()); - - objectMapper.registerModule(module); - } - - /** - * Method to serialize a thrift object to json - * @param object - * @return - * @throws JsonProcessingException - */ - public String serializeObject(TBase object) throws JsonProcessingException { - String json = this.objectMapper.writeValueAsString(object); - return json; - } - - /** - * Method to deserialize a json to the thrift object - * @param clz - * @param json - * @return - * @throws IOException - */ - public TBase deserializeObject(Class<?> clz, String json) throws IOException { - return (TBase)this.objectMapper.readValue(json, clz); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata/blob/801489bf/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/appcatalog/idot/InputDataObjectTypeDeserializer.java ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/appcatalog/idot/InputDataObjectTypeDeserializer.java b/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/appcatalog/idot/InputDataObjectTypeDeserializer.java deleted file mode 100644 index c0b4252..0000000 --- a/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/appcatalog/idot/InputDataObjectTypeDeserializer.java +++ /dev/null @@ -1,44 +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.persistance.registry.jpa.mongo.conversion.appcatalog.idot; - -import org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.AbstractThriftDeserializer; -import org.apache.thrift.TException; - -public class InputDataObjectTypeDeserializer extends - AbstractThriftDeserializer<InputDataObjectType._Fields, InputDataObjectType> { - - @Override - protected InputDataObjectType._Fields getField(final String fieldName) { - return InputDataObjectType._Fields.valueOf(fieldName); - } - - @Override - protected InputDataObjectType newInstance() { - return new InputDataObjectType(); - } - - @Override - protected void validate(final InputDataObjectType instance) throws TException { - instance.validate(); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata/blob/801489bf/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/appcatalog/idot/InputDataObjectTypeSerializer.java ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/appcatalog/idot/InputDataObjectTypeSerializer.java b/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/appcatalog/idot/InputDataObjectTypeSerializer.java deleted file mode 100644 index 23ba9a4..0000000 --- a/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/appcatalog/idot/InputDataObjectTypeSerializer.java +++ /dev/null @@ -1,41 +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.persistance.registry.jpa.mongo.conversion.appcatalog.idot; - -import org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.AbstractThriftSerializer; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class InputDataObjectTypeSerializer extends - AbstractThriftSerializer<InputDataObjectType._Fields, InputDataObjectType> { - private final static Logger logger = LoggerFactory.getLogger(InputDataObjectTypeSerializer.class); - - @Override - protected InputDataObjectType._Fields[] getFieldValues() { - return InputDataObjectType._Fields.values(); - } - - @Override - protected Class<InputDataObjectType> getThriftClass() { - return null; - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata/blob/801489bf/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/appcatalog/odot/OutputDataObjectTypeDeserializer.java ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/appcatalog/odot/OutputDataObjectTypeDeserializer.java b/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/appcatalog/odot/OutputDataObjectTypeDeserializer.java deleted file mode 100644 index 8eb9dda..0000000 --- a/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/appcatalog/odot/OutputDataObjectTypeDeserializer.java +++ /dev/null @@ -1,44 +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.persistance.registry.jpa.mongo.conversion.appcatalog.odot; - -import org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.AbstractThriftDeserializer; -import org.apache.thrift.TException; - -public class OutputDataObjectTypeDeserializer extends - AbstractThriftDeserializer<OutputDataObjectType._Fields, OutputDataObjectType> { - - @Override - protected OutputDataObjectType._Fields getField(final String fieldName) { - return OutputDataObjectType._Fields.valueOf(fieldName); - } - - @Override - protected OutputDataObjectType newInstance() { - return new OutputDataObjectType(); - } - - @Override - protected void validate(final OutputDataObjectType instance) throws TException { - instance.validate(); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata/blob/801489bf/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/appcatalog/odot/OutputDataObjectTypeSerializer.java ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/appcatalog/odot/OutputDataObjectTypeSerializer.java b/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/appcatalog/odot/OutputDataObjectTypeSerializer.java deleted file mode 100644 index 26bc349..0000000 --- a/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/appcatalog/odot/OutputDataObjectTypeSerializer.java +++ /dev/null @@ -1,41 +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.persistance.registry.jpa.mongo.conversion.appcatalog.odot; - -import org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.AbstractThriftSerializer; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class OutputDataObjectTypeSerializer extends - AbstractThriftSerializer<OutputDataObjectType._Fields, OutputDataObjectType> { - private final static Logger logger = LoggerFactory.getLogger(OutputDataObjectTypeSerializer.class); - - @Override - protected OutputDataObjectType._Fields[] getFieldValues() { - return OutputDataObjectType._Fields.values(); - } - - @Override - protected Class<OutputDataObjectType> getThriftClass() { - return null; - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata/blob/801489bf/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/experiment/ExperimentDeserializer.java ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/experiment/ExperimentDeserializer.java b/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/experiment/ExperimentDeserializer.java deleted file mode 100644 index 21fed5b..0000000 --- a/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/experiment/ExperimentDeserializer.java +++ /dev/null @@ -1,44 +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.persistance.registry.jpa.mongo.conversion.experiment; - -import org.apache.airavata.model.workspace.experiment.Experiment; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.AbstractThriftDeserializer; -import org.apache.thrift.TException; - -public class ExperimentDeserializer extends - AbstractThriftDeserializer<Experiment._Fields, Experiment> { - - @Override - protected Experiment._Fields getField(final String fieldName) { - return Experiment._Fields.valueOf(fieldName); - } - - @Override - protected Experiment newInstance() { - return new Experiment(); - } - - @Override - protected void validate(final Experiment instance) throws TException { - instance.validate(); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata/blob/801489bf/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/experiment/ExperimentSerializer.java ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/experiment/ExperimentSerializer.java b/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/experiment/ExperimentSerializer.java deleted file mode 100644 index 96d07a3..0000000 --- a/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/experiment/ExperimentSerializer.java +++ /dev/null @@ -1,41 +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.persistance.registry.jpa.mongo.conversion.experiment; - -import org.apache.airavata.model.workspace.experiment.Experiment; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.AbstractThriftSerializer; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class ExperimentSerializer extends - AbstractThriftSerializer<Experiment._Fields, Experiment> { - private final static Logger logger = LoggerFactory.getLogger(ExperimentSerializer.class); - - @Override - protected Experiment._Fields[] getFieldValues() { - return Experiment._Fields.values(); - } - - @Override - protected Class<Experiment> getThriftClass() { - return null; - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata/blob/801489bf/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/experiment/aidh/AdvancedInputDataHandlingDeserializer.java ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/experiment/aidh/AdvancedInputDataHandlingDeserializer.java b/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/experiment/aidh/AdvancedInputDataHandlingDeserializer.java deleted file mode 100644 index 6de28f3..0000000 --- a/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/experiment/aidh/AdvancedInputDataHandlingDeserializer.java +++ /dev/null @@ -1,44 +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.persistance.registry.jpa.mongo.conversion.experiment.aidh; - -import org.apache.airavata.model.workspace.experiment.AdvancedInputDataHandling; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.AbstractThriftDeserializer; -import org.apache.thrift.TException; - -public class AdvancedInputDataHandlingDeserializer extends - AbstractThriftDeserializer<AdvancedInputDataHandling._Fields, AdvancedInputDataHandling> { - - @Override - protected AdvancedInputDataHandling._Fields getField(final String fieldName) { - return AdvancedInputDataHandling._Fields.valueOf(fieldName); - } - - @Override - protected AdvancedInputDataHandling newInstance() { - return new AdvancedInputDataHandling(); - } - - @Override - protected void validate(final AdvancedInputDataHandling instance) throws TException { - instance.validate(); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata/blob/801489bf/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/experiment/aidh/AdvancedInputDataHandlingSerializer.java ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/experiment/aidh/AdvancedInputDataHandlingSerializer.java b/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/experiment/aidh/AdvancedInputDataHandlingSerializer.java deleted file mode 100644 index 2f01375..0000000 --- a/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/experiment/aidh/AdvancedInputDataHandlingSerializer.java +++ /dev/null @@ -1,41 +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.persistance.registry.jpa.mongo.conversion.experiment.aidh; - -import org.apache.airavata.model.workspace.experiment.AdvancedInputDataHandling; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.AbstractThriftSerializer; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class AdvancedInputDataHandlingSerializer extends - AbstractThriftSerializer<AdvancedInputDataHandling._Fields, AdvancedInputDataHandling> { - private final static Logger logger = LoggerFactory.getLogger(AdvancedInputDataHandlingSerializer.class); - - @Override - protected AdvancedInputDataHandling._Fields[] getFieldValues() { - return AdvancedInputDataHandling._Fields.values(); - } - - @Override - protected Class<AdvancedInputDataHandling> getThriftClass() { - return null; - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata/blob/801489bf/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/experiment/aodh/AdvancedOutputDataHandlingDeserializer.java ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/experiment/aodh/AdvancedOutputDataHandlingDeserializer.java b/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/experiment/aodh/AdvancedOutputDataHandlingDeserializer.java deleted file mode 100644 index 071d31b..0000000 --- a/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/experiment/aodh/AdvancedOutputDataHandlingDeserializer.java +++ /dev/null @@ -1,44 +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.persistance.registry.jpa.mongo.conversion.experiment.aodh; - -import org.apache.airavata.model.workspace.experiment.AdvancedOutputDataHandling; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.AbstractThriftDeserializer; -import org.apache.thrift.TException; - -public class AdvancedOutputDataHandlingDeserializer extends - AbstractThriftDeserializer<AdvancedOutputDataHandling._Fields, AdvancedOutputDataHandling> { - - @Override - protected AdvancedOutputDataHandling._Fields getField(final String fieldName) { - return AdvancedOutputDataHandling._Fields.valueOf(fieldName); - } - - @Override - protected AdvancedOutputDataHandling newInstance() { - return new AdvancedOutputDataHandling(); - } - - @Override - protected void validate(final AdvancedOutputDataHandling instance) throws TException { - instance.validate(); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata/blob/801489bf/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/experiment/aodh/AdvancedOutputDataHandlingSerializer.java ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/experiment/aodh/AdvancedOutputDataHandlingSerializer.java b/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/experiment/aodh/AdvancedOutputDataHandlingSerializer.java deleted file mode 100644 index c675ce0..0000000 --- a/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/experiment/aodh/AdvancedOutputDataHandlingSerializer.java +++ /dev/null @@ -1,41 +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.persistance.registry.jpa.mongo.conversion.experiment.aodh; - -import org.apache.airavata.model.workspace.experiment.AdvancedOutputDataHandling; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.AbstractThriftSerializer; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class AdvancedOutputDataHandlingSerializer extends - AbstractThriftSerializer<AdvancedOutputDataHandling._Fields, AdvancedOutputDataHandling> { - private final static Logger logger = LoggerFactory.getLogger(AdvancedOutputDataHandlingSerializer.class); - - @Override - protected AdvancedOutputDataHandling._Fields[] getFieldValues() { - return AdvancedOutputDataHandling._Fields.values(); - } - - @Override - protected Class<AdvancedOutputDataHandling> getThriftClass() { - return null; - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata/blob/801489bf/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/experiment/appstatus/ApplicationStatusDeserializer.java ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/experiment/appstatus/ApplicationStatusDeserializer.java b/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/experiment/appstatus/ApplicationStatusDeserializer.java deleted file mode 100644 index e08c71d..0000000 --- a/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/experiment/appstatus/ApplicationStatusDeserializer.java +++ /dev/null @@ -1,44 +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.persistance.registry.jpa.mongo.conversion.experiment.appstatus; - -import org.apache.airavata.model.workspace.experiment.ApplicationStatus; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.AbstractThriftDeserializer; -import org.apache.thrift.TException; - -public class ApplicationStatusDeserializer extends - AbstractThriftDeserializer<ApplicationStatus._Fields, ApplicationStatus> { - - @Override - protected ApplicationStatus._Fields getField(final String fieldName) { - return ApplicationStatus._Fields.valueOf(fieldName); - } - - @Override - protected ApplicationStatus newInstance() { - return new ApplicationStatus(); - } - - @Override - protected void validate(final ApplicationStatus instance) throws TException { - instance.validate(); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata/blob/801489bf/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/experiment/appstatus/ApplicationStatusSerializer.java ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/experiment/appstatus/ApplicationStatusSerializer.java b/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/experiment/appstatus/ApplicationStatusSerializer.java deleted file mode 100644 index f428a58..0000000 --- a/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/experiment/appstatus/ApplicationStatusSerializer.java +++ /dev/null @@ -1,42 +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.persistance.registry.jpa.mongo.conversion.experiment.appstatus; - -import org.apache.airavata.model.workspace.experiment.ApplicationStatus; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.AbstractThriftSerializer; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class ApplicationStatusSerializer extends - AbstractThriftSerializer<ApplicationStatus._Fields, ApplicationStatus> { - private final static Logger logger = LoggerFactory.getLogger( - ApplicationStatusSerializer.class); - - @Override - protected ApplicationStatus._Fields[] getFieldValues() { - return ApplicationStatus._Fields.values(); - } - - @Override - protected Class<ApplicationStatus> getThriftClass() { - return null; - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata/blob/801489bf/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/experiment/crsh/ComputationalResourceSchedulingDeserializer.java ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/experiment/crsh/ComputationalResourceSchedulingDeserializer.java b/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/experiment/crsh/ComputationalResourceSchedulingDeserializer.java deleted file mode 100644 index 5ab463e..0000000 --- a/modules/registry/airavata-mongo-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/mongo/conversion/experiment/crsh/ComputationalResourceSchedulingDeserializer.java +++ /dev/null @@ -1,44 +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.persistance.registry.jpa.mongo.conversion.experiment.crsh; - -import org.apache.airavata.model.workspace.experiment.ComputationalResourceScheduling; -import org.apache.airavata.persistance.registry.jpa.mongo.conversion.AbstractThriftDeserializer; -import org.apache.thrift.TException; - -public class ComputationalResourceSchedulingDeserializer extends - AbstractThriftDeserializer<ComputationalResourceScheduling._Fields, ComputationalResourceScheduling> { - - @Override - protected ComputationalResourceScheduling._Fields getField(final String fieldName) { - return ComputationalResourceScheduling._Fields.valueOf(fieldName); - } - - @Override - protected ComputationalResourceScheduling newInstance() { - return new ComputationalResourceScheduling(); - } - - @Override - protected void validate(final ComputationalResourceScheduling instance) throws TException { - instance.validate(); - } -} \ No newline at end of file
