You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2019/06/11 12:59:56 UTC
[airavata] branch develop updated (cf7d671 -> 6c41f4f)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git.
from cf7d671 AIRAVATA-3029 Fixing typo
new bf3c1a8 Regenerated thrift stubs
new 6c41f4f Using getters instead of direct member access
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../api/server/handler/AiravataServerHandler.java | 34 +++---
.../java/org/apache/airavata/base/api/BaseAPI.java | 33 +++---
.../service/security/GatewayGroupsInitializer.java | 6 +-
.../migrator/airavata/AiravataDataMigrator.java | 116 ++++++++++-----------
.../messaging/SharingServiceDBEventHandler.java | 18 ++--
.../server/SharingRegistryServerHandler.java | 20 ++--
.../airavata/sharing/registry/models/Domain.java | 60 +++++------
.../registry/models/DuplicateEntryException.java | 45 ++++----
.../airavata/sharing/registry/models/Entity.java | 103 ++++++++----------
.../sharing/registry/models/EntitySearchField.java | 33 +++---
.../sharing/registry/models/EntityType.java | 65 ++++++------
.../sharing/registry/models/GroupAdmin.java | 50 ++++-----
.../sharing/registry/models/GroupCardinality.java | 33 +++---
.../sharing/registry/models/GroupChildType.java | 33 +++---
.../sharing/registry/models/GroupMembership.java | 69 ++++++------
.../sharing/registry/models/GroupType.java | 33 +++---
.../sharing/registry/models/PermissionType.java | 65 ++++++------
.../sharing/registry/models/SearchCondition.java | 33 +++---
.../sharing/registry/models/SearchCriteria.java | 58 ++++-------
.../airavata/sharing/registry/models/Sharing.java | 79 ++++++--------
.../registry/models/SharingRegistryException.java | 45 ++++----
.../sharing/registry/models/SharingType.java | 33 +++---
.../airavata/sharing/registry/models/User.java | 83 +++++++--------
.../sharing/registry/models/UserGroup.java | 93 +++++++----------
.../registry/models/sharing_modelsConstants.java | 33 +++---
25 files changed, 590 insertions(+), 683 deletions(-)
[airavata] 01/02: Regenerated thrift stubs
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit bf3c1a8809c287d35cdb3569188a10478793d2d5
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Mon Jun 10 15:55:17 2019 -0400
Regenerated thrift stubs
---
.../java/org/apache/airavata/base/api/BaseAPI.java | 33 +++----
.../airavata/sharing/registry/models/Domain.java | 60 ++++++------
.../registry/models/DuplicateEntryException.java | 45 +++++----
.../airavata/sharing/registry/models/Entity.java | 103 +++++++++------------
.../sharing/registry/models/EntitySearchField.java | 33 +++----
.../sharing/registry/models/EntityType.java | 65 ++++++-------
.../sharing/registry/models/GroupAdmin.java | 50 +++++-----
.../sharing/registry/models/GroupCardinality.java | 33 +++----
.../sharing/registry/models/GroupChildType.java | 33 +++----
.../sharing/registry/models/GroupMembership.java | 69 ++++++--------
.../sharing/registry/models/GroupType.java | 33 +++----
.../sharing/registry/models/PermissionType.java | 65 ++++++-------
.../sharing/registry/models/SearchCondition.java | 33 +++----
.../sharing/registry/models/SearchCriteria.java | 58 +++++-------
.../airavata/sharing/registry/models/Sharing.java | 79 +++++++---------
.../registry/models/SharingRegistryException.java | 45 +++++----
.../sharing/registry/models/SharingType.java | 33 +++----
.../airavata/sharing/registry/models/User.java | 83 +++++++----------
.../sharing/registry/models/UserGroup.java | 93 ++++++++-----------
.../registry/models/sharing_modelsConstants.java | 33 +++----
20 files changed, 490 insertions(+), 589 deletions(-)
diff --git a/airavata-api/airavata-base-api/src/main/java/org/apache/airavata/base/api/BaseAPI.java b/airavata-api/airavata-base-api/src/main/java/org/apache/airavata/base/api/BaseAPI.java
index 5cf8573..b15445b 100644
--- a/airavata-api/airavata-base-api/src/main/java/org/apache/airavata/base/api/BaseAPI.java
+++ b/airavata-api/airavata-base-api/src/main/java/org/apache/airavata/base/api/BaseAPI.java
@@ -1,19 +1,20 @@
- /*
- * 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.
- */
+/**
+ * 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.10.0)
*
diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Domain.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Domain.java
index ac40583..1b0fdd9 100644
--- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Domain.java
+++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Domain.java
@@ -1,19 +1,20 @@
- /*
- * 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.
- */
+/**
+ * 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.10.0)
*
@@ -47,11 +48,11 @@ public class Domain implements org.apache.thrift.TBase<Domain, Domain._Fields>,
private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new DomainStandardSchemeFactory();
private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new DomainTupleSchemeFactory();
- public java.lang.String domainId; // optional
- public java.lang.String name; // optional
- public java.lang.String description; // optional
- public long createdTime; // optional
- public long updatedTime; // optional
+ private java.lang.String domainId; // optional
+ private java.lang.String name; // optional
+ private java.lang.String description; // optional
+ private long createdTime; // optional
+ private long updatedTime; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -188,9 +189,8 @@ public class Domain implements org.apache.thrift.TBase<Domain, Domain._Fields>,
return this.domainId;
}
- public Domain setDomainId(java.lang.String domainId) {
+ public void setDomainId(java.lang.String domainId) {
this.domainId = domainId;
- return this;
}
public void unsetDomainId() {
@@ -212,9 +212,8 @@ public class Domain implements org.apache.thrift.TBase<Domain, Domain._Fields>,
return this.name;
}
- public Domain setName(java.lang.String name) {
+ public void setName(java.lang.String name) {
this.name = name;
- return this;
}
public void unsetName() {
@@ -236,9 +235,8 @@ public class Domain implements org.apache.thrift.TBase<Domain, Domain._Fields>,
return this.description;
}
- public Domain setDescription(java.lang.String description) {
+ public void setDescription(java.lang.String description) {
this.description = description;
- return this;
}
public void unsetDescription() {
@@ -260,10 +258,9 @@ public class Domain implements org.apache.thrift.TBase<Domain, Domain._Fields>,
return this.createdTime;
}
- public Domain setCreatedTime(long createdTime) {
+ public void setCreatedTime(long createdTime) {
this.createdTime = createdTime;
setCreatedTimeIsSet(true);
- return this;
}
public void unsetCreatedTime() {
@@ -283,10 +280,9 @@ public class Domain implements org.apache.thrift.TBase<Domain, Domain._Fields>,
return this.updatedTime;
}
- public Domain setUpdatedTime(long updatedTime) {
+ public void setUpdatedTime(long updatedTime) {
this.updatedTime = updatedTime;
setUpdatedTimeIsSet(true);
- return this;
}
public void unsetUpdatedTime() {
@@ -689,8 +685,6 @@ public class Domain implements org.apache.thrift.TBase<Domain, Domain._Fields>,
iprot.readFieldEnd();
}
iprot.readStructEnd();
-
- // check for required fields of primitive type, which can't be checked in the validate method
struct.validate();
}
diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/DuplicateEntryException.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/DuplicateEntryException.java
index 88a03bf..e8ef517 100644
--- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/DuplicateEntryException.java
+++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/DuplicateEntryException.java
@@ -1,19 +1,20 @@
- /*
- * 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.
- */
+/**
+ * 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.10.0)
*
@@ -39,7 +40,7 @@ public class DuplicateEntryException extends org.apache.thrift.TException implem
private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new DuplicateEntryExceptionStandardSchemeFactory();
private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new DuplicateEntryExceptionTupleSchemeFactory();
- public java.lang.String message; // required
+ private java.lang.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 {
@@ -141,9 +142,8 @@ public class DuplicateEntryException extends org.apache.thrift.TException implem
return this.message;
}
- public DuplicateEntryException setMessage(java.lang.String message) {
+ public void setMessage(java.lang.String message) {
this.message = message;
- return this;
}
public void unsetMessage() {
@@ -285,9 +285,10 @@ public class DuplicateEntryException extends org.apache.thrift.TException implem
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());
+ if (!isSetMessage()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'message' is unset! Struct:" + toString());
}
+
// check for sub-struct validity
}
@@ -339,8 +340,6 @@ public class DuplicateEntryException extends org.apache.thrift.TException implem
iprot.readFieldEnd();
}
iprot.readStructEnd();
-
- // check for required fields of primitive type, which can't be checked in the validate method
struct.validate();
}
diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Entity.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Entity.java
index 35475e4..5f9bab5 100644
--- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Entity.java
+++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Entity.java
@@ -1,19 +1,20 @@
- /*
- * 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.
- */
+/**
+ * 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.10.0)
*
@@ -61,19 +62,19 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new EntityStandardSchemeFactory();
private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new EntityTupleSchemeFactory();
- public java.lang.String entityId; // optional
- public java.lang.String domainId; // optional
- public java.lang.String entityTypeId; // optional
- public java.lang.String ownerId; // optional
- public java.lang.String parentEntityId; // optional
- public java.lang.String name; // optional
- public java.lang.String description; // optional
- public java.nio.ByteBuffer binaryData; // optional
- public java.lang.String fullText; // optional
- public long sharedCount; // optional
- public long originalEntityCreationTime; // optional
- public long createdTime; // optional
- public long updatedTime; // optional
+ private java.lang.String entityId; // optional
+ private java.lang.String domainId; // optional
+ private java.lang.String entityTypeId; // optional
+ private java.lang.String ownerId; // optional
+ private java.lang.String parentEntityId; // optional
+ private java.lang.String name; // optional
+ private java.lang.String description; // optional
+ private java.nio.ByteBuffer binaryData; // optional
+ private java.lang.String fullText; // optional
+ private long sharedCount; // optional
+ private long originalEntityCreationTime; // optional
+ private long createdTime; // optional
+ private long updatedTime; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -281,9 +282,8 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
return this.entityId;
}
- public Entity setEntityId(java.lang.String entityId) {
+ public void setEntityId(java.lang.String entityId) {
this.entityId = entityId;
- return this;
}
public void unsetEntityId() {
@@ -305,9 +305,8 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
return this.domainId;
}
- public Entity setDomainId(java.lang.String domainId) {
+ public void setDomainId(java.lang.String domainId) {
this.domainId = domainId;
- return this;
}
public void unsetDomainId() {
@@ -329,9 +328,8 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
return this.entityTypeId;
}
- public Entity setEntityTypeId(java.lang.String entityTypeId) {
+ public void setEntityTypeId(java.lang.String entityTypeId) {
this.entityTypeId = entityTypeId;
- return this;
}
public void unsetEntityTypeId() {
@@ -353,9 +351,8 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
return this.ownerId;
}
- public Entity setOwnerId(java.lang.String ownerId) {
+ public void setOwnerId(java.lang.String ownerId) {
this.ownerId = ownerId;
- return this;
}
public void unsetOwnerId() {
@@ -377,9 +374,8 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
return this.parentEntityId;
}
- public Entity setParentEntityId(java.lang.String parentEntityId) {
+ public void setParentEntityId(java.lang.String parentEntityId) {
this.parentEntityId = parentEntityId;
- return this;
}
public void unsetParentEntityId() {
@@ -401,9 +397,8 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
return this.name;
}
- public Entity setName(java.lang.String name) {
+ public void setName(java.lang.String name) {
this.name = name;
- return this;
}
public void unsetName() {
@@ -425,9 +420,8 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
return this.description;
}
- public Entity setDescription(java.lang.String description) {
+ public void setDescription(java.lang.String description) {
this.description = description;
- return this;
}
public void unsetDescription() {
@@ -454,14 +448,12 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
return org.apache.thrift.TBaseHelper.copyBinary(binaryData);
}
- public Entity setBinaryData(byte[] binaryData) {
+ public void setBinaryData(byte[] binaryData) {
this.binaryData = binaryData == null ? (java.nio.ByteBuffer)null : java.nio.ByteBuffer.wrap(binaryData.clone());
- return this;
}
- public Entity setBinaryData(java.nio.ByteBuffer binaryData) {
+ public void setBinaryData(java.nio.ByteBuffer binaryData) {
this.binaryData = org.apache.thrift.TBaseHelper.copyBinary(binaryData);
- return this;
}
public void unsetBinaryData() {
@@ -483,9 +475,8 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
return this.fullText;
}
- public Entity setFullText(java.lang.String fullText) {
+ public void setFullText(java.lang.String fullText) {
this.fullText = fullText;
- return this;
}
public void unsetFullText() {
@@ -507,10 +498,9 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
return this.sharedCount;
}
- public Entity setSharedCount(long sharedCount) {
+ public void setSharedCount(long sharedCount) {
this.sharedCount = sharedCount;
setSharedCountIsSet(true);
- return this;
}
public void unsetSharedCount() {
@@ -530,10 +520,9 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
return this.originalEntityCreationTime;
}
- public Entity setOriginalEntityCreationTime(long originalEntityCreationTime) {
+ public void setOriginalEntityCreationTime(long originalEntityCreationTime) {
this.originalEntityCreationTime = originalEntityCreationTime;
setOriginalEntityCreationTimeIsSet(true);
- return this;
}
public void unsetOriginalEntityCreationTime() {
@@ -553,10 +542,9 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
return this.createdTime;
}
- public Entity setCreatedTime(long createdTime) {
+ public void setCreatedTime(long createdTime) {
this.createdTime = createdTime;
setCreatedTimeIsSet(true);
- return this;
}
public void unsetCreatedTime() {
@@ -576,10 +564,9 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
return this.updatedTime;
}
- public Entity setUpdatedTime(long updatedTime) {
+ public void setUpdatedTime(long updatedTime) {
this.updatedTime = updatedTime;
setUpdatedTimeIsSet(true);
- return this;
}
public void unsetUpdatedTime() {
@@ -1410,8 +1397,6 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
iprot.readFieldEnd();
}
iprot.readStructEnd();
-
- // check for required fields of primitive type, which can't be checked in the validate method
struct.validate();
}
diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/EntitySearchField.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/EntitySearchField.java
index c9418e2..84fb0a4 100644
--- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/EntitySearchField.java
+++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/EntitySearchField.java
@@ -1,19 +1,20 @@
- /*
- * 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.
- */
+/**
+ * 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.10.0)
*
diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/EntityType.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/EntityType.java
index e84959c..1536760 100644
--- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/EntityType.java
+++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/EntityType.java
@@ -1,19 +1,20 @@
- /*
- * 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.
- */
+/**
+ * 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.10.0)
*
@@ -47,12 +48,12 @@ public class EntityType implements org.apache.thrift.TBase<EntityType, EntityTyp
private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new EntityTypeStandardSchemeFactory();
private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new EntityTypeTupleSchemeFactory();
- public java.lang.String entityTypeId; // optional
- public java.lang.String domainId; // optional
- public java.lang.String name; // optional
- public java.lang.String description; // optional
- public long createdTime; // optional
- public long updatedTime; // optional
+ private java.lang.String entityTypeId; // optional
+ private java.lang.String domainId; // optional
+ private java.lang.String name; // optional
+ private java.lang.String description; // optional
+ private long createdTime; // optional
+ private long updatedTime; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -195,9 +196,8 @@ public class EntityType implements org.apache.thrift.TBase<EntityType, EntityTyp
return this.entityTypeId;
}
- public EntityType setEntityTypeId(java.lang.String entityTypeId) {
+ public void setEntityTypeId(java.lang.String entityTypeId) {
this.entityTypeId = entityTypeId;
- return this;
}
public void unsetEntityTypeId() {
@@ -219,9 +219,8 @@ public class EntityType implements org.apache.thrift.TBase<EntityType, EntityTyp
return this.domainId;
}
- public EntityType setDomainId(java.lang.String domainId) {
+ public void setDomainId(java.lang.String domainId) {
this.domainId = domainId;
- return this;
}
public void unsetDomainId() {
@@ -243,9 +242,8 @@ public class EntityType implements org.apache.thrift.TBase<EntityType, EntityTyp
return this.name;
}
- public EntityType setName(java.lang.String name) {
+ public void setName(java.lang.String name) {
this.name = name;
- return this;
}
public void unsetName() {
@@ -267,9 +265,8 @@ public class EntityType implements org.apache.thrift.TBase<EntityType, EntityTyp
return this.description;
}
- public EntityType setDescription(java.lang.String description) {
+ public void setDescription(java.lang.String description) {
this.description = description;
- return this;
}
public void unsetDescription() {
@@ -291,10 +288,9 @@ public class EntityType implements org.apache.thrift.TBase<EntityType, EntityTyp
return this.createdTime;
}
- public EntityType setCreatedTime(long createdTime) {
+ public void setCreatedTime(long createdTime) {
this.createdTime = createdTime;
setCreatedTimeIsSet(true);
- return this;
}
public void unsetCreatedTime() {
@@ -314,10 +310,9 @@ public class EntityType implements org.apache.thrift.TBase<EntityType, EntityTyp
return this.updatedTime;
}
- public EntityType setUpdatedTime(long updatedTime) {
+ public void setUpdatedTime(long updatedTime) {
this.updatedTime = updatedTime;
setUpdatedTimeIsSet(true);
- return this;
}
public void unsetUpdatedTime() {
@@ -774,8 +769,6 @@ public class EntityType implements org.apache.thrift.TBase<EntityType, EntityTyp
iprot.readFieldEnd();
}
iprot.readStructEnd();
-
- // check for required fields of primitive type, which can't be checked in the validate method
struct.validate();
}
diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/GroupAdmin.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/GroupAdmin.java
index 088667e..d970719 100644
--- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/GroupAdmin.java
+++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/GroupAdmin.java
@@ -1,19 +1,20 @@
- /*
- * 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.
- */
+/**
+ * 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.10.0)
*
@@ -34,9 +35,9 @@ public class GroupAdmin implements org.apache.thrift.TBase<GroupAdmin, GroupAdmi
private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new GroupAdminStandardSchemeFactory();
private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new GroupAdminTupleSchemeFactory();
- public java.lang.String groupId; // optional
- public java.lang.String domainId; // optional
- public java.lang.String adminId; // optional
+ private java.lang.String groupId; // optional
+ private java.lang.String domainId; // optional
+ private java.lang.String adminId; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -150,9 +151,8 @@ public class GroupAdmin implements org.apache.thrift.TBase<GroupAdmin, GroupAdmi
return this.groupId;
}
- public GroupAdmin setGroupId(java.lang.String groupId) {
+ public void setGroupId(java.lang.String groupId) {
this.groupId = groupId;
- return this;
}
public void unsetGroupId() {
@@ -174,9 +174,8 @@ public class GroupAdmin implements org.apache.thrift.TBase<GroupAdmin, GroupAdmi
return this.domainId;
}
- public GroupAdmin setDomainId(java.lang.String domainId) {
+ public void setDomainId(java.lang.String domainId) {
this.domainId = domainId;
- return this;
}
public void unsetDomainId() {
@@ -198,9 +197,8 @@ public class GroupAdmin implements org.apache.thrift.TBase<GroupAdmin, GroupAdmi
return this.adminId;
}
- public GroupAdmin setAdminId(java.lang.String adminId) {
+ public void setAdminId(java.lang.String adminId) {
this.adminId = adminId;
- return this;
}
public void unsetAdminId() {
@@ -503,8 +501,6 @@ public class GroupAdmin implements org.apache.thrift.TBase<GroupAdmin, GroupAdmi
iprot.readFieldEnd();
}
iprot.readStructEnd();
-
- // check for required fields of primitive type, which can't be checked in the validate method
struct.validate();
}
diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/GroupCardinality.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/GroupCardinality.java
index c038951..772b4c1 100644
--- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/GroupCardinality.java
+++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/GroupCardinality.java
@@ -1,19 +1,20 @@
- /*
- * 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.
- */
+/**
+ * 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.10.0)
*
diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/GroupChildType.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/GroupChildType.java
index 3a08598..acb421f 100644
--- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/GroupChildType.java
+++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/GroupChildType.java
@@ -1,19 +1,20 @@
- /*
- * 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.
- */
+/**
+ * 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.10.0)
*
diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/GroupMembership.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/GroupMembership.java
index 2c938383..2f37788 100644
--- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/GroupMembership.java
+++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/GroupMembership.java
@@ -1,19 +1,20 @@
- /*
- * 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.
- */
+/**
+ * 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.10.0)
*
@@ -41,16 +42,12 @@ public class GroupMembership implements org.apache.thrift.TBase<GroupMembership,
private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new GroupMembershipStandardSchemeFactory();
private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new GroupMembershipTupleSchemeFactory();
- public java.lang.String parentId; // optional
- public java.lang.String childId; // optional
- public java.lang.String domainId; // optional
- /**
- *
- * @see GroupChildType
- */
- public GroupChildType childType; // optional
- public long createdTime; // optional
- public long updatedTime; // optional
+ private java.lang.String parentId; // optional
+ private java.lang.String childId; // optional
+ private java.lang.String domainId; // optional
+ private GroupChildType childType; // optional
+ private long createdTime; // optional
+ private long updatedTime; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -197,9 +194,8 @@ public class GroupMembership implements org.apache.thrift.TBase<GroupMembership,
return this.parentId;
}
- public GroupMembership setParentId(java.lang.String parentId) {
+ public void setParentId(java.lang.String parentId) {
this.parentId = parentId;
- return this;
}
public void unsetParentId() {
@@ -221,9 +217,8 @@ public class GroupMembership implements org.apache.thrift.TBase<GroupMembership,
return this.childId;
}
- public GroupMembership setChildId(java.lang.String childId) {
+ public void setChildId(java.lang.String childId) {
this.childId = childId;
- return this;
}
public void unsetChildId() {
@@ -245,9 +240,8 @@ public class GroupMembership implements org.apache.thrift.TBase<GroupMembership,
return this.domainId;
}
- public GroupMembership setDomainId(java.lang.String domainId) {
+ public void setDomainId(java.lang.String domainId) {
this.domainId = domainId;
- return this;
}
public void unsetDomainId() {
@@ -277,9 +271,8 @@ public class GroupMembership implements org.apache.thrift.TBase<GroupMembership,
*
* @see GroupChildType
*/
- public GroupMembership setChildType(GroupChildType childType) {
+ public void setChildType(GroupChildType childType) {
this.childType = childType;
- return this;
}
public void unsetChildType() {
@@ -301,10 +294,9 @@ public class GroupMembership implements org.apache.thrift.TBase<GroupMembership,
return this.createdTime;
}
- public GroupMembership setCreatedTime(long createdTime) {
+ public void setCreatedTime(long createdTime) {
this.createdTime = createdTime;
setCreatedTimeIsSet(true);
- return this;
}
public void unsetCreatedTime() {
@@ -324,10 +316,9 @@ public class GroupMembership implements org.apache.thrift.TBase<GroupMembership,
return this.updatedTime;
}
- public GroupMembership setUpdatedTime(long updatedTime) {
+ public void setUpdatedTime(long updatedTime) {
this.updatedTime = updatedTime;
setUpdatedTimeIsSet(true);
- return this;
}
public void unsetUpdatedTime() {
@@ -784,8 +775,6 @@ public class GroupMembership implements org.apache.thrift.TBase<GroupMembership,
iprot.readFieldEnd();
}
iprot.readStructEnd();
-
- // check for required fields of primitive type, which can't be checked in the validate method
struct.validate();
}
diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/GroupType.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/GroupType.java
index e4d9ef3..3cb1527 100644
--- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/GroupType.java
+++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/GroupType.java
@@ -1,19 +1,20 @@
- /*
- * 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.
- */
+/**
+ * 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.10.0)
*
diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/PermissionType.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/PermissionType.java
index 212defd..96df5d3 100644
--- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/PermissionType.java
+++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/PermissionType.java
@@ -1,19 +1,20 @@
- /*
- * 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.
- */
+/**
+ * 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.10.0)
*
@@ -47,12 +48,12 @@ public class PermissionType implements org.apache.thrift.TBase<PermissionType, P
private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new PermissionTypeStandardSchemeFactory();
private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new PermissionTypeTupleSchemeFactory();
- public java.lang.String permissionTypeId; // optional
- public java.lang.String domainId; // optional
- public java.lang.String name; // optional
- public java.lang.String description; // optional
- public long createdTime; // optional
- public long updatedTime; // optional
+ private java.lang.String permissionTypeId; // optional
+ private java.lang.String domainId; // optional
+ private java.lang.String name; // optional
+ private java.lang.String description; // optional
+ private long createdTime; // optional
+ private long updatedTime; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -195,9 +196,8 @@ public class PermissionType implements org.apache.thrift.TBase<PermissionType, P
return this.permissionTypeId;
}
- public PermissionType setPermissionTypeId(java.lang.String permissionTypeId) {
+ public void setPermissionTypeId(java.lang.String permissionTypeId) {
this.permissionTypeId = permissionTypeId;
- return this;
}
public void unsetPermissionTypeId() {
@@ -219,9 +219,8 @@ public class PermissionType implements org.apache.thrift.TBase<PermissionType, P
return this.domainId;
}
- public PermissionType setDomainId(java.lang.String domainId) {
+ public void setDomainId(java.lang.String domainId) {
this.domainId = domainId;
- return this;
}
public void unsetDomainId() {
@@ -243,9 +242,8 @@ public class PermissionType implements org.apache.thrift.TBase<PermissionType, P
return this.name;
}
- public PermissionType setName(java.lang.String name) {
+ public void setName(java.lang.String name) {
this.name = name;
- return this;
}
public void unsetName() {
@@ -267,9 +265,8 @@ public class PermissionType implements org.apache.thrift.TBase<PermissionType, P
return this.description;
}
- public PermissionType setDescription(java.lang.String description) {
+ public void setDescription(java.lang.String description) {
this.description = description;
- return this;
}
public void unsetDescription() {
@@ -291,10 +288,9 @@ public class PermissionType implements org.apache.thrift.TBase<PermissionType, P
return this.createdTime;
}
- public PermissionType setCreatedTime(long createdTime) {
+ public void setCreatedTime(long createdTime) {
this.createdTime = createdTime;
setCreatedTimeIsSet(true);
- return this;
}
public void unsetCreatedTime() {
@@ -314,10 +310,9 @@ public class PermissionType implements org.apache.thrift.TBase<PermissionType, P
return this.updatedTime;
}
- public PermissionType setUpdatedTime(long updatedTime) {
+ public void setUpdatedTime(long updatedTime) {
this.updatedTime = updatedTime;
setUpdatedTimeIsSet(true);
- return this;
}
public void unsetUpdatedTime() {
@@ -774,8 +769,6 @@ public class PermissionType implements org.apache.thrift.TBase<PermissionType, P
iprot.readFieldEnd();
}
iprot.readStructEnd();
-
- // check for required fields of primitive type, which can't be checked in the validate method
struct.validate();
}
diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/SearchCondition.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/SearchCondition.java
index 2090c19..865fa88 100644
--- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/SearchCondition.java
+++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/SearchCondition.java
@@ -1,19 +1,20 @@
- /*
- * 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.
- */
+/**
+ * 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.10.0)
*
diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/SearchCriteria.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/SearchCriteria.java
index ee8d933..8afaf8e 100644
--- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/SearchCriteria.java
+++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/SearchCriteria.java
@@ -1,19 +1,20 @@
- /*
- * 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.
- */
+/**
+ * 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.10.0)
*
@@ -41,17 +42,9 @@ public class SearchCriteria implements org.apache.thrift.TBase<SearchCriteria, S
private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new SearchCriteriaStandardSchemeFactory();
private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new SearchCriteriaTupleSchemeFactory();
- /**
- *
- * @see EntitySearchField
- */
- public EntitySearchField searchField; // optional
- public java.lang.String value; // optional
- /**
- *
- * @see SearchCondition
- */
- public SearchCondition searchCondition; // optional
+ private EntitySearchField searchField; // optional
+ private java.lang.String value; // optional
+ private SearchCondition searchCondition; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -181,9 +174,8 @@ public class SearchCriteria implements org.apache.thrift.TBase<SearchCriteria, S
*
* @see EntitySearchField
*/
- public SearchCriteria setSearchField(EntitySearchField searchField) {
+ public void setSearchField(EntitySearchField searchField) {
this.searchField = searchField;
- return this;
}
public void unsetSearchField() {
@@ -205,9 +197,8 @@ public class SearchCriteria implements org.apache.thrift.TBase<SearchCriteria, S
return this.value;
}
- public SearchCriteria setValue(java.lang.String value) {
+ public void setValue(java.lang.String value) {
this.value = value;
- return this;
}
public void unsetValue() {
@@ -237,9 +228,8 @@ public class SearchCriteria implements org.apache.thrift.TBase<SearchCriteria, S
*
* @see SearchCondition
*/
- public SearchCriteria setSearchCondition(SearchCondition searchCondition) {
+ public void setSearchCondition(SearchCondition searchCondition) {
this.searchCondition = searchCondition;
- return this;
}
public void unsetSearchCondition() {
@@ -542,8 +532,6 @@ public class SearchCriteria implements org.apache.thrift.TBase<SearchCriteria, S
iprot.readFieldEnd();
}
iprot.readStructEnd();
-
- // check for required fields of primitive type, which can't be checked in the validate method
struct.validate();
}
diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Sharing.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Sharing.java
index 6645f42..e5c956c 100644
--- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Sharing.java
+++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Sharing.java
@@ -1,19 +1,20 @@
- /*
- * 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.
- */
+/**
+ * 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.10.0)
*
@@ -43,18 +44,14 @@ public class Sharing implements org.apache.thrift.TBase<Sharing, Sharing._Fields
private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new SharingStandardSchemeFactory();
private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new SharingTupleSchemeFactory();
- public java.lang.String permissionTypeId; // optional
- public java.lang.String entityId; // optional
- public java.lang.String groupId; // optional
- /**
- *
- * @see SharingType
- */
- public SharingType sharingType; // optional
- public java.lang.String domainId; // optional
- public java.lang.String inheritedParentId; // optional
- public long createdTime; // optional
- public long updatedTime; // optional
+ private java.lang.String permissionTypeId; // optional
+ private java.lang.String entityId; // optional
+ private java.lang.String groupId; // optional
+ private SharingType sharingType; // optional
+ private java.lang.String domainId; // optional
+ private java.lang.String inheritedParentId; // optional
+ private long createdTime; // optional
+ private long updatedTime; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -219,9 +216,8 @@ public class Sharing implements org.apache.thrift.TBase<Sharing, Sharing._Fields
return this.permissionTypeId;
}
- public Sharing setPermissionTypeId(java.lang.String permissionTypeId) {
+ public void setPermissionTypeId(java.lang.String permissionTypeId) {
this.permissionTypeId = permissionTypeId;
- return this;
}
public void unsetPermissionTypeId() {
@@ -243,9 +239,8 @@ public class Sharing implements org.apache.thrift.TBase<Sharing, Sharing._Fields
return this.entityId;
}
- public Sharing setEntityId(java.lang.String entityId) {
+ public void setEntityId(java.lang.String entityId) {
this.entityId = entityId;
- return this;
}
public void unsetEntityId() {
@@ -267,9 +262,8 @@ public class Sharing implements org.apache.thrift.TBase<Sharing, Sharing._Fields
return this.groupId;
}
- public Sharing setGroupId(java.lang.String groupId) {
+ public void setGroupId(java.lang.String groupId) {
this.groupId = groupId;
- return this;
}
public void unsetGroupId() {
@@ -299,9 +293,8 @@ public class Sharing implements org.apache.thrift.TBase<Sharing, Sharing._Fields
*
* @see SharingType
*/
- public Sharing setSharingType(SharingType sharingType) {
+ public void setSharingType(SharingType sharingType) {
this.sharingType = sharingType;
- return this;
}
public void unsetSharingType() {
@@ -323,9 +316,8 @@ public class Sharing implements org.apache.thrift.TBase<Sharing, Sharing._Fields
return this.domainId;
}
- public Sharing setDomainId(java.lang.String domainId) {
+ public void setDomainId(java.lang.String domainId) {
this.domainId = domainId;
- return this;
}
public void unsetDomainId() {
@@ -347,9 +339,8 @@ public class Sharing implements org.apache.thrift.TBase<Sharing, Sharing._Fields
return this.inheritedParentId;
}
- public Sharing setInheritedParentId(java.lang.String inheritedParentId) {
+ public void setInheritedParentId(java.lang.String inheritedParentId) {
this.inheritedParentId = inheritedParentId;
- return this;
}
public void unsetInheritedParentId() {
@@ -371,10 +362,9 @@ public class Sharing implements org.apache.thrift.TBase<Sharing, Sharing._Fields
return this.createdTime;
}
- public Sharing setCreatedTime(long createdTime) {
+ public void setCreatedTime(long createdTime) {
this.createdTime = createdTime;
setCreatedTimeIsSet(true);
- return this;
}
public void unsetCreatedTime() {
@@ -394,10 +384,9 @@ public class Sharing implements org.apache.thrift.TBase<Sharing, Sharing._Fields
return this.updatedTime;
}
- public Sharing setUpdatedTime(long updatedTime) {
+ public void setUpdatedTime(long updatedTime) {
this.updatedTime = updatedTime;
setUpdatedTimeIsSet(true);
- return this;
}
public void unsetUpdatedTime() {
@@ -962,8 +951,6 @@ public class Sharing implements org.apache.thrift.TBase<Sharing, Sharing._Fields
iprot.readFieldEnd();
}
iprot.readStructEnd();
-
- // check for required fields of primitive type, which can't be checked in the validate method
struct.validate();
}
diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/SharingRegistryException.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/SharingRegistryException.java
index 953a42a..4bad273 100644
--- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/SharingRegistryException.java
+++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/SharingRegistryException.java
@@ -1,19 +1,20 @@
- /*
- * 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.
- */
+/**
+ * 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.10.0)
*
@@ -36,7 +37,7 @@ public class SharingRegistryException extends org.apache.thrift.TException imple
private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new SharingRegistryExceptionStandardSchemeFactory();
private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new SharingRegistryExceptionTupleSchemeFactory();
- public java.lang.String message; // required
+ private java.lang.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 {
@@ -138,9 +139,8 @@ public class SharingRegistryException extends org.apache.thrift.TException imple
return this.message;
}
- public SharingRegistryException setMessage(java.lang.String message) {
+ public void setMessage(java.lang.String message) {
this.message = message;
- return this;
}
public void unsetMessage() {
@@ -282,9 +282,10 @@ public class SharingRegistryException extends org.apache.thrift.TException imple
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());
+ if (!isSetMessage()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'message' is unset! Struct:" + toString());
}
+
// check for sub-struct validity
}
@@ -336,8 +337,6 @@ public class SharingRegistryException extends org.apache.thrift.TException imple
iprot.readFieldEnd();
}
iprot.readStructEnd();
-
- // check for required fields of primitive type, which can't be checked in the validate method
struct.validate();
}
diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/SharingType.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/SharingType.java
index 03910fa..8048352 100644
--- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/SharingType.java
+++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/SharingType.java
@@ -1,19 +1,20 @@
- /*
- * 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.
- */
+/**
+ * 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.10.0)
*
diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/User.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/User.java
index 4c453c5..2ad188b 100644
--- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/User.java
+++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/User.java
@@ -1,19 +1,20 @@
- /*
- * 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.
- */
+/**
+ * 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.10.0)
*
@@ -54,15 +55,15 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i
private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new UserStandardSchemeFactory();
private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new UserTupleSchemeFactory();
- public java.lang.String userId; // optional
- public java.lang.String domainId; // optional
- public java.lang.String userName; // optional
- public java.lang.String firstName; // optional
- public java.lang.String lastName; // optional
- public java.lang.String email; // optional
- public java.nio.ByteBuffer icon; // optional
- public long createdTime; // optional
- public long updatedTime; // optional
+ private java.lang.String userId; // optional
+ private java.lang.String domainId; // optional
+ private java.lang.String userName; // optional
+ private java.lang.String firstName; // optional
+ private java.lang.String lastName; // optional
+ private java.lang.String email; // optional
+ private java.nio.ByteBuffer icon; // optional
+ private long createdTime; // optional
+ private long updatedTime; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -232,9 +233,8 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i
return this.userId;
}
- public User setUserId(java.lang.String userId) {
+ public void setUserId(java.lang.String userId) {
this.userId = userId;
- return this;
}
public void unsetUserId() {
@@ -256,9 +256,8 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i
return this.domainId;
}
- public User setDomainId(java.lang.String domainId) {
+ public void setDomainId(java.lang.String domainId) {
this.domainId = domainId;
- return this;
}
public void unsetDomainId() {
@@ -280,9 +279,8 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i
return this.userName;
}
- public User setUserName(java.lang.String userName) {
+ public void setUserName(java.lang.String userName) {
this.userName = userName;
- return this;
}
public void unsetUserName() {
@@ -304,9 +302,8 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i
return this.firstName;
}
- public User setFirstName(java.lang.String firstName) {
+ public void setFirstName(java.lang.String firstName) {
this.firstName = firstName;
- return this;
}
public void unsetFirstName() {
@@ -328,9 +325,8 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i
return this.lastName;
}
- public User setLastName(java.lang.String lastName) {
+ public void setLastName(java.lang.String lastName) {
this.lastName = lastName;
- return this;
}
public void unsetLastName() {
@@ -352,9 +348,8 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i
return this.email;
}
- public User setEmail(java.lang.String email) {
+ public void setEmail(java.lang.String email) {
this.email = email;
- return this;
}
public void unsetEmail() {
@@ -381,14 +376,12 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i
return org.apache.thrift.TBaseHelper.copyBinary(icon);
}
- public User setIcon(byte[] icon) {
+ public void setIcon(byte[] icon) {
this.icon = icon == null ? (java.nio.ByteBuffer)null : java.nio.ByteBuffer.wrap(icon.clone());
- return this;
}
- public User setIcon(java.nio.ByteBuffer icon) {
+ public void setIcon(java.nio.ByteBuffer icon) {
this.icon = org.apache.thrift.TBaseHelper.copyBinary(icon);
- return this;
}
public void unsetIcon() {
@@ -410,10 +403,9 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i
return this.createdTime;
}
- public User setCreatedTime(long createdTime) {
+ public void setCreatedTime(long createdTime) {
this.createdTime = createdTime;
setCreatedTimeIsSet(true);
- return this;
}
public void unsetCreatedTime() {
@@ -433,10 +425,9 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i
return this.updatedTime;
}
- public User setUpdatedTime(long updatedTime) {
+ public void setUpdatedTime(long updatedTime) {
this.updatedTime = updatedTime;
setUpdatedTimeIsSet(true);
- return this;
}
public void unsetUpdatedTime() {
@@ -1059,8 +1050,6 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i
iprot.readFieldEnd();
}
iprot.readStructEnd();
-
- // check for required fields of primitive type, which can't be checked in the validate method
struct.validate();
}
diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/UserGroup.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/UserGroup.java
index 35aa942..4641405 100644
--- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/UserGroup.java
+++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/UserGroup.java
@@ -1,19 +1,20 @@
- /*
- * 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.
- */
+/**
+ * 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.10.0)
*
@@ -55,24 +56,16 @@ public class UserGroup implements org.apache.thrift.TBase<UserGroup, UserGroup._
private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new UserGroupStandardSchemeFactory();
private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new UserGroupTupleSchemeFactory();
- public java.lang.String groupId; // optional
- public java.lang.String domainId; // optional
- public java.lang.String name; // optional
- public java.lang.String description; // optional
- public java.lang.String ownerId; // optional
- /**
- *
- * @see GroupType
- */
- public GroupType groupType; // optional
- /**
- *
- * @see GroupCardinality
- */
- public GroupCardinality groupCardinality; // optional
- public long createdTime; // optional
- public long updatedTime; // optional
- public java.util.List<GroupAdmin> groupAdmins; // optional
+ private java.lang.String groupId; // optional
+ private java.lang.String domainId; // optional
+ private java.lang.String name; // optional
+ private java.lang.String description; // optional
+ private java.lang.String ownerId; // optional
+ private GroupType groupType; // optional
+ private GroupCardinality groupCardinality; // optional
+ private long createdTime; // optional
+ private long updatedTime; // optional
+ private java.util.List<GroupAdmin> groupAdmins; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -264,9 +257,8 @@ public class UserGroup implements org.apache.thrift.TBase<UserGroup, UserGroup._
return this.groupId;
}
- public UserGroup setGroupId(java.lang.String groupId) {
+ public void setGroupId(java.lang.String groupId) {
this.groupId = groupId;
- return this;
}
public void unsetGroupId() {
@@ -288,9 +280,8 @@ public class UserGroup implements org.apache.thrift.TBase<UserGroup, UserGroup._
return this.domainId;
}
- public UserGroup setDomainId(java.lang.String domainId) {
+ public void setDomainId(java.lang.String domainId) {
this.domainId = domainId;
- return this;
}
public void unsetDomainId() {
@@ -312,9 +303,8 @@ public class UserGroup implements org.apache.thrift.TBase<UserGroup, UserGroup._
return this.name;
}
- public UserGroup setName(java.lang.String name) {
+ public void setName(java.lang.String name) {
this.name = name;
- return this;
}
public void unsetName() {
@@ -336,9 +326,8 @@ public class UserGroup implements org.apache.thrift.TBase<UserGroup, UserGroup._
return this.description;
}
- public UserGroup setDescription(java.lang.String description) {
+ public void setDescription(java.lang.String description) {
this.description = description;
- return this;
}
public void unsetDescription() {
@@ -360,9 +349,8 @@ public class UserGroup implements org.apache.thrift.TBase<UserGroup, UserGroup._
return this.ownerId;
}
- public UserGroup setOwnerId(java.lang.String ownerId) {
+ public void setOwnerId(java.lang.String ownerId) {
this.ownerId = ownerId;
- return this;
}
public void unsetOwnerId() {
@@ -392,9 +380,8 @@ public class UserGroup implements org.apache.thrift.TBase<UserGroup, UserGroup._
*
* @see GroupType
*/
- public UserGroup setGroupType(GroupType groupType) {
+ public void setGroupType(GroupType groupType) {
this.groupType = groupType;
- return this;
}
public void unsetGroupType() {
@@ -424,9 +411,8 @@ public class UserGroup implements org.apache.thrift.TBase<UserGroup, UserGroup._
*
* @see GroupCardinality
*/
- public UserGroup setGroupCardinality(GroupCardinality groupCardinality) {
+ public void setGroupCardinality(GroupCardinality groupCardinality) {
this.groupCardinality = groupCardinality;
- return this;
}
public void unsetGroupCardinality() {
@@ -448,10 +434,9 @@ public class UserGroup implements org.apache.thrift.TBase<UserGroup, UserGroup._
return this.createdTime;
}
- public UserGroup setCreatedTime(long createdTime) {
+ public void setCreatedTime(long createdTime) {
this.createdTime = createdTime;
setCreatedTimeIsSet(true);
- return this;
}
public void unsetCreatedTime() {
@@ -471,10 +456,9 @@ public class UserGroup implements org.apache.thrift.TBase<UserGroup, UserGroup._
return this.updatedTime;
}
- public UserGroup setUpdatedTime(long updatedTime) {
+ public void setUpdatedTime(long updatedTime) {
this.updatedTime = updatedTime;
setUpdatedTimeIsSet(true);
- return this;
}
public void unsetUpdatedTime() {
@@ -509,9 +493,8 @@ public class UserGroup implements org.apache.thrift.TBase<UserGroup, UserGroup._
return this.groupAdmins;
}
- public UserGroup setGroupAdmins(java.util.List<GroupAdmin> groupAdmins) {
+ public void setGroupAdmins(java.util.List<GroupAdmin> groupAdmins) {
this.groupAdmins = groupAdmins;
- return this;
}
public void unsetGroupAdmins() {
@@ -1197,8 +1180,6 @@ public class UserGroup implements org.apache.thrift.TBase<UserGroup, UserGroup._
iprot.readFieldEnd();
}
iprot.readStructEnd();
-
- // check for required fields of primitive type, which can't be checked in the validate method
struct.validate();
}
diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/sharing_modelsConstants.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/sharing_modelsConstants.java
index 8f33a5c..4390099 100644
--- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/sharing_modelsConstants.java
+++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/sharing_modelsConstants.java
@@ -1,19 +1,20 @@
- /*
- * 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.
- */
+/**
+ * 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.10.0)
*
[airavata] 02/02: Using getters instead of direct member access
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 6c41f4fbaa349d05aba4e249c2ca5d8ef3250407
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Tue Jun 11 08:59:32 2019 -0400
Using getters instead of direct member access
---
.../api/server/handler/AiravataServerHandler.java | 34 +++---
.../service/security/GatewayGroupsInitializer.java | 6 +-
.../migrator/airavata/AiravataDataMigrator.java | 116 ++++++++++-----------
.../messaging/SharingServiceDBEventHandler.java | 18 ++--
.../server/SharingRegistryServerHandler.java | 20 ++--
5 files changed, 100 insertions(+), 94 deletions(-)
diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
index 115061a..7ca4346 100644
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
@@ -235,22 +235,22 @@ public class AiravataServerHandler implements Airavata.Iface {
client.createEntityType(entityType);
entityType = new EntityType();
- entityType.setEntityTypeId(domain.domainId+":"+ResourceType.APPLICATION_DEPLOYMENT.name());
- entityType.setDomainId(domain.domainId);
+ entityType.setEntityTypeId(domain.getDomainId()+":"+ResourceType.APPLICATION_DEPLOYMENT.name());
+ entityType.setDomainId(domain.getDomainId());
entityType.setName("APPLICATION-DEPLOYMENT");
entityType.setDescription("Application Deployment entity type");
client.createEntityType(entityType);
entityType = new EntityType();
- entityType.setEntityTypeId(domain.domainId+":"+ResourceType.GROUP_RESOURCE_PROFILE.name());
- entityType.setDomainId(domain.domainId);
+ entityType.setEntityTypeId(domain.getDomainId()+":"+ResourceType.GROUP_RESOURCE_PROFILE.name());
+ entityType.setDomainId(domain.getDomainId());
entityType.setName(ResourceType.GROUP_RESOURCE_PROFILE.name());
entityType.setDescription("Group Resource Profile entity type");
client.createEntityType(entityType);
entityType = new EntityType();
- entityType.setEntityTypeId(domain.domainId+":"+ResourceType.CREDENTIAL_TOKEN.name());
- entityType.setDomainId(domain.domainId);
+ entityType.setEntityTypeId(domain.getDomainId()+":"+ResourceType.CREDENTIAL_TOKEN.name());
+ entityType.setDomainId(domain.getDomainId());
entityType.setName(ResourceType.CREDENTIAL_TOKEN.name());
entityType.setDescription("Credential Store Token entity type");
client.createEntityType(entityType);
@@ -348,15 +348,15 @@ public class AiravataServerHandler implements Airavata.Iface {
sharingClient.createEntityType(entityType);
entityType = new EntityType();
- entityType.setEntityTypeId(domain.domainId+":"+ResourceType.APPLICATION_DEPLOYMENT.name());
- entityType.setDomainId(domain.domainId);
+ entityType.setEntityTypeId(domain.getDomainId()+":"+ResourceType.APPLICATION_DEPLOYMENT.name());
+ entityType.setDomainId(domain.getDomainId());
entityType.setName("APPLICATION-DEPLOYMENT");
entityType.setDescription("Application Deployment entity type");
sharingClient.createEntityType(entityType);
entityType = new EntityType();
- entityType.setEntityTypeId(domain.domainId+":"+ResourceType.GROUP_RESOURCE_PROFILE.name());
- entityType.setDomainId(domain.domainId);
+ entityType.setEntityTypeId(domain.getDomainId()+":"+ResourceType.GROUP_RESOURCE_PROFILE.name());
+ entityType.setDomainId(domain.getDomainId());
entityType.setName(ResourceType.GROUP_RESOURCE_PROFILE.name());
entityType.setDescription("Group Resource Profile entity type");
sharingClient.createEntityType(entityType);
@@ -768,7 +768,7 @@ public class AiravataServerHandler implements Airavata.Iface {
filters.add(searchCriteria);
List<String> accessibleTokenIds = sharingClient.searchEntities(gatewayId, userName + "@" + gatewayId, filters, 0, -1)
.stream()
- .map(p -> p.entityId)
+ .map(p -> p.getEntityId())
.collect(Collectors.toList());
List<CredentialSummary> credentialSummaries = csClient.getAllCredentialSummaries(type, accessibleTokenIds, gatewayId);
csClientPool.returnResource(csClient);
@@ -2329,7 +2329,7 @@ public class AiravataServerHandler implements Airavata.Iface {
permissionTypeFilter.setValue(gatewayId + ":" + ResourcePermissionType.READ);
sharingFilters.add(permissionTypeFilter);
sharingClient.searchEntities(authzToken.getClaimsMap().get(Constants.GATEWAY_ID),
- userName + "@" + gatewayId, sharingFilters, 0, -1).forEach(a -> accessibleAppDeploymentIds.add(a.entityId));
+ userName + "@" + gatewayId, sharingFilters, 0, -1).forEach(a -> accessibleAppDeploymentIds.add(a.getEntityId()));
}
List<String> accessibleComputeResourceIds = new ArrayList<>();
List<GroupResourceProfile> groupResourceProfileList = getGroupResourceList(authzToken, gatewayId);
@@ -2569,7 +2569,7 @@ public class AiravataServerHandler implements Airavata.Iface {
permissionTypeFilter.setValue(gatewayId + ":" + permissionType.name());
sharingFilters.add(permissionTypeFilter);
sharingClient.searchEntities(authzToken.getClaimsMap().get(Constants.GATEWAY_ID),
- userName + "@" + gatewayId, sharingFilters, 0, -1).forEach(a -> accessibleAppDeploymentIds.add(a.entityId));
+ userName + "@" + gatewayId, sharingFilters, 0, -1).forEach(a -> accessibleAppDeploymentIds.add(a.getEntityId()));
}
List<String> accessibleComputeResourceIds = new ArrayList<>();
List<GroupResourceProfile> groupResourceProfileList = getGroupResourceList(authzToken, gatewayId);
@@ -2669,7 +2669,7 @@ public class AiravataServerHandler implements Airavata.Iface {
permissionTypeFilter.setValue(gatewayId + ":" + ResourcePermissionType.READ);
sharingFilters.add(permissionTypeFilter);
sharingClient.searchEntities(gatewayId, userName + "@" + gatewayId, sharingFilters, 0, -1)
- .forEach(a -> accessibleAppDeploymentIds.add(a.entityId));
+ .forEach(a -> accessibleAppDeploymentIds.add(a.getEntityId()));
List<ApplicationDeploymentDescription> result = regClient.getAccessibleApplicationDeploymentsForAppModule(
gatewayId, appModuleId, accessibleAppDeploymentIds, accessibleComputeResourceIds);
@@ -5266,11 +5266,11 @@ public class AiravataServerHandler implements Airavata.Iface {
if (permissionType.equals(ResourcePermissionType.WRITE)) {
groupListFunction.apply(sharingClient, ResourcePermissionType.WRITE)
.stream()
- .forEach(g -> accessibleGroups.add(g.groupId));
+ .forEach(g -> accessibleGroups.add(g.getGroupId()));
} else if (permissionType.equals(ResourcePermissionType.READ)) {
groupListFunction.apply(sharingClient, ResourcePermissionType.READ)
.stream()
- .forEach(g -> accessibleGroups.add(g.groupId));
+ .forEach(g -> accessibleGroups.add(g.getGroupId()));
}
registryClientPool.returnResource(regClient);
sharingClientPool.returnResource(sharingClient);
@@ -5490,7 +5490,7 @@ public class AiravataServerHandler implements Airavata.Iface {
filters.add(searchCriteria);
sharingClient.searchEntities(authzToken.getClaimsMap().get(Constants.GATEWAY_ID),
userName + "@" + gatewayId, filters, 0, -1).stream().forEach(p -> accessibleGroupResProfileIds
- .add(p.entityId));
+ .add(p.getEntityId()));
}
List<GroupResourceProfile> groupResourceProfileList = regClient.getGroupResourceList(gatewayId, accessibleGroupResProfileIds);
diff --git a/airavata-services/services-security/src/main/java/org/apache/airavata/service/security/GatewayGroupsInitializer.java b/airavata-services/services-security/src/main/java/org/apache/airavata/service/security/GatewayGroupsInitializer.java
index c51d67a..fcc1ae5 100644
--- a/airavata-services/services-security/src/main/java/org/apache/airavata/service/security/GatewayGroupsInitializer.java
+++ b/airavata-services/services-security/src/main/java/org/apache/airavata/service/security/GatewayGroupsInitializer.java
@@ -98,17 +98,17 @@ public class GatewayGroupsInitializer {
UserGroup gatewayUsersGroup = createGroup(sharingRegistryClient, gatewayId, ownerId,
"Gateway Users",
"Default group for users of the gateway.");
- gatewayGroups.setDefaultGatewayUsersGroupId(gatewayUsersGroup.groupId);
+ gatewayGroups.setDefaultGatewayUsersGroupId(gatewayUsersGroup.getGroupId());
// Admin Users
UserGroup adminUsersGroup = createGroup(sharingRegistryClient, gatewayId, ownerId,
"Admin Users",
"Admin users group.");
- gatewayGroups.setAdminsGroupId(adminUsersGroup.groupId);
+ gatewayGroups.setAdminsGroupId(adminUsersGroup.getGroupId());
// Read Only Admin Users
UserGroup readOnlyAdminsGroup = createGroup(sharingRegistryClient, gatewayId, ownerId,
"Read Only Admin Users",
"Group of admin users with read-only access.");
- gatewayGroups.setReadOnlyAdminsGroupId(readOnlyAdminsGroup.groupId);
+ gatewayGroups.setReadOnlyAdminsGroupId(readOnlyAdminsGroup.getGroupId());
registryClient.createGatewayGroups(gatewayGroups);
diff --git a/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/migrator/airavata/AiravataDataMigrator.java b/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/migrator/airavata/AiravataDataMigrator.java
index cd6b91f..57caba2 100644
--- a/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/migrator/airavata/AiravataDataMigrator.java
+++ b/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/migrator/airavata/AiravataDataMigrator.java
@@ -114,27 +114,27 @@ public class AiravataDataMigrator {
sharingRegistryServerHandler.createEntityType(entityType);
entityType = new EntityType();
- entityType.setEntityTypeId(domain.domainId+":"+ ResourceType.APPLICATION_DEPLOYMENT.name());
- entityType.setDomainId(domain.domainId);
+ entityType.setEntityTypeId(domain.getDomainId()+":"+ ResourceType.APPLICATION_DEPLOYMENT.name());
+ entityType.setDomainId(domain.getDomainId());
entityType.setName("APPLICATION-DEPLOYMENT");
entityType.setDescription("Application Deployment entity type");
- if (!sharingRegistryServerHandler.isEntityTypeExists(entityType.domainId, entityType.entityTypeId))
+ if (!sharingRegistryServerHandler.isEntityTypeExists(entityType.getDomainId(), entityType.getEntityTypeId()))
sharingRegistryServerHandler.createEntityType(entityType);
entityType = new EntityType();
- entityType.setEntityTypeId(domain.domainId+":"+ResourceType.GROUP_RESOURCE_PROFILE.name());
- entityType.setDomainId(domain.domainId);
+ entityType.setEntityTypeId(domain.getDomainId()+":"+ResourceType.GROUP_RESOURCE_PROFILE.name());
+ entityType.setDomainId(domain.getDomainId());
entityType.setName(ResourceType.GROUP_RESOURCE_PROFILE.name());
entityType.setDescription("Group Resource Profile entity type");
- if (!sharingRegistryServerHandler.isEntityTypeExists(entityType.domainId, entityType.entityTypeId))
+ if (!sharingRegistryServerHandler.isEntityTypeExists(entityType.getDomainId(), entityType.getEntityTypeId()))
sharingRegistryServerHandler.createEntityType(entityType);
entityType = new EntityType();
- entityType.setEntityTypeId(domain.domainId+":"+ResourceType.CREDENTIAL_TOKEN.name());
- entityType.setDomainId(domain.domainId);
+ entityType.setEntityTypeId(domain.getDomainId()+":"+ResourceType.CREDENTIAL_TOKEN.name());
+ entityType.setDomainId(domain.getDomainId());
entityType.setName(ResourceType.CREDENTIAL_TOKEN.name());
entityType.setDescription("Credential Store Token entity type");
- if (!sharingRegistryServerHandler.isEntityTypeExists(entityType.domainId, entityType.entityTypeId))
+ if (!sharingRegistryServerHandler.isEntityTypeExists(entityType.getDomainId(), entityType.getEntityTypeId()))
sharingRegistryServerHandler.createEntityType(entityType);
//Creating Permission Types for each domain
@@ -187,23 +187,23 @@ public class AiravataDataMigrator {
final RegistryService.Client registryServiceClient = getRegistryServiceClient();
for (Domain domain : domainList) {
// If we're only running migration for gatewayId, then skip other gateways
- if (gatewayId != null && !gatewayId.equals(domain.domainId)) {
+ if (gatewayId != null && !gatewayId.equals(domain.getDomainId())) {
continue;
}
String ownerId = getAdminOwnerUser(domain, sharingRegistryServerHandler, credentialStoreServiceClient, registryServiceClient);
if (ownerId != null) {
- domainOwnerMap.put(domain.domainId, ownerId);
+ domainOwnerMap.put(domain.getDomainId(), ownerId);
} else {
continue;
}
- if (registryServiceClient.isGatewayGroupsExists(domain.domainId)) {
- GatewayGroups gatewayGroups = registryServiceClient.getGatewayGroups(domain.domainId);
- gatewayGroupsMap.put(domain.domainId, gatewayGroups);
+ if (registryServiceClient.isGatewayGroupsExists(domain.getDomainId())) {
+ GatewayGroups gatewayGroups = registryServiceClient.getGatewayGroups(domain.getDomainId());
+ gatewayGroupsMap.put(domain.getDomainId(), gatewayGroups);
} else {
GatewayGroups gatewayGroups = migrateRolesToGatewayGroups(domain, ownerId, sharingRegistryServerHandler, registryServiceClient);
- gatewayGroupsMap.put(domain.domainId, gatewayGroups);
+ gatewayGroupsMap.put(domain.getDomainId(), gatewayGroups);
}
}
@@ -268,24 +268,24 @@ public class AiravataDataMigrator {
}
for (Entity entity : projectEntities) {
- if (!sharingRegistryServerHandler.isEntityExists(entity.domainId, entity.entityId)) {
+ if (!sharingRegistryServerHandler.isEntityExists(entity.getDomainId(), entity.getEntityId())) {
sharingRegistryServerHandler.createEntity(entity);
}
}
for (Entity entity : experimentEntities) {
- if (!sharingRegistryServerHandler.isEntityExists(entity.domainId, entity.entityId)) {
- if (!sharingRegistryServerHandler.isEntityExists(entity.domainId, entity.parentEntityId)) {
- System.out.println("Warning: project entity does exist for experiment entity " + entity.entityId + " in gateway " + entity.domainId);
+ if (!sharingRegistryServerHandler.isEntityExists(entity.getDomainId(), entity.getEntityId())) {
+ if (!sharingRegistryServerHandler.isEntityExists(entity.getDomainId(), entity.getParentEntityId())) {
+ System.out.println("Warning: project entity does exist for experiment entity " + entity.getEntityId() + " in gateway " + entity.getDomainId());
continue;
} else {
sharingRegistryServerHandler.createEntity(entity);
}
}
- if (gatewayGroupsMap.containsKey(entity.domainId)) {
- shareEntityWithAdminGatewayGroups(sharingRegistryServerHandler, entity, gatewayGroupsMap.get(entity.domainId), false);
+ if (gatewayGroupsMap.containsKey(entity.getDomainId())) {
+ shareEntityWithAdminGatewayGroups(sharingRegistryServerHandler, entity, gatewayGroupsMap.get(entity.getDomainId()), false);
} else {
- System.out.println("Warning: no Admin gateway groups to share experiment entity " + entity.entityId + " in gateway " + entity.domainId);
+ System.out.println("Warning: no Admin gateway groups to share experiment entity " + entity.getEntityId() + " in gateway " + entity.getDomainId());
}
}
@@ -297,7 +297,7 @@ public class AiravataDataMigrator {
Entity entity = new Entity();
entity.setEntityId(description.getAppDeploymentId());
entity.setDomainId(domainID);
- entity.setEntityTypeId(entity.domainId + ":" + ResourceType.APPLICATION_DEPLOYMENT.name());
+ entity.setEntityTypeId(entity.getDomainId() + ":" + ResourceType.APPLICATION_DEPLOYMENT.name());
entity.setOwnerId(domainOwnerMap.get(domainID));
entity.setName(description.getAppDeploymentId());
entity.setDescription(description.getAppDeploymentDescription());
@@ -306,7 +306,7 @@ public class AiravataDataMigrator {
else
entity.setFullText(entity.getName() + " " + entity.getDescription());
- if (!sharingRegistryServerHandler.isEntityExists(entity.domainId, entity.entityId))
+ if (!sharingRegistryServerHandler.isEntityExists(entity.getDomainId(), entity.getEntityId()))
sharingRegistryServerHandler.createEntity(entity);
shareEntityWithGatewayGroups(sharingRegistryServerHandler, entity, gatewayGroups, false);
}
@@ -323,11 +323,11 @@ public class AiravataDataMigrator {
Entity entity = new Entity();
entity.setEntityId(groupResourceProfile.getGroupResourceProfileId());
entity.setDomainId(domainID);
- entity.setEntityTypeId(entity.domainId + ":" + ResourceType.GROUP_RESOURCE_PROFILE.name());
+ entity.setEntityTypeId(entity.getDomainId() + ":" + ResourceType.GROUP_RESOURCE_PROFILE.name());
entity.setOwnerId(domainOwnerMap.get(domainID));
entity.setName(groupResourceProfile.getGroupResourceProfileName());
entity.setDescription(groupResourceProfile.getGroupResourceProfileName() + " Group Resource Profile");
- if (!sharingRegistryServerHandler.isEntityExists(entity.domainId, entity.entityId))
+ if (!sharingRegistryServerHandler.isEntityExists(entity.getDomainId(), entity.getEntityId()))
sharingRegistryServerHandler.createEntity(entity);
shareEntityWithGatewayGroups(sharingRegistryServerHandler, entity, gatewayGroups, false);
@@ -341,14 +341,14 @@ public class AiravataDataMigrator {
Entity entity = new Entity();
entity.setEntityId(credentialSummary.getToken());
entity.setDomainId(domainID);
- entity.setEntityTypeId(entity.domainId + ":" + ResourceType.CREDENTIAL_TOKEN.name());
+ entity.setEntityTypeId(entity.getDomainId() + ":" + ResourceType.CREDENTIAL_TOKEN.name());
entity.setOwnerId(domainOwnerMap.get(domainID));
entity.setName(credentialSummary.getToken());
entity.setDescription(credentialSummary.getDescription());
- if (!sharingRegistryServerHandler.isEntityExists(entity.domainId, entity.entityId))
+ if (!sharingRegistryServerHandler.isEntityExists(entity.getDomainId(), entity.getEntityId()))
sharingRegistryServerHandler.createEntity(entity);
- if (gatewayGroupsMap.containsKey(entity.domainId)) {
- shareEntityWithAdminGatewayGroups(sharingRegistryServerHandler, entity, gatewayGroupsMap.get(entity.domainId), false);
+ if (gatewayGroupsMap.containsKey(entity.getDomainId())) {
+ shareEntityWithAdminGatewayGroups(sharingRegistryServerHandler, entity, gatewayGroupsMap.get(entity.getDomainId()), false);
}
}
}
@@ -370,11 +370,11 @@ public class AiravataDataMigrator {
Entity entity = new Entity();
entity.setEntityId(credentialSummary.getToken());
entity.setDomainId(domainID);
- entity.setEntityTypeId(entity.domainId + ":" + ResourceType.CREDENTIAL_TOKEN.name());
+ entity.setEntityTypeId(entity.getDomainId() + ":" + ResourceType.CREDENTIAL_TOKEN.name());
entity.setOwnerId(userId);
entity.setName(credentialSummary.getToken());
entity.setDescription(credentialSummary.getDescription());
- if (!sharingRegistryServerHandler.isEntityExists(entity.domainId, entity.entityId))
+ if (!sharingRegistryServerHandler.isEntityExists(entity.getDomainId(), entity.getEntityId()))
sharingRegistryServerHandler.createEntity(entity);
// Don't need to share USER SSH tokens with any group
}
@@ -387,14 +387,14 @@ public class AiravataDataMigrator {
Entity entity = new Entity();
entity.setEntityId(gatewayPasswordEntry.getKey());
entity.setDomainId(domainID);
- entity.setEntityTypeId(entity.domainId + ":" + ResourceType.CREDENTIAL_TOKEN.name());
+ entity.setEntityTypeId(entity.getDomainId() + ":" + ResourceType.CREDENTIAL_TOKEN.name());
entity.setOwnerId(domainOwnerMap.get(domainID));
entity.setName(gatewayPasswordEntry.getKey());
entity.setDescription(gatewayPasswordEntry.getValue());
- if (!sharingRegistryServerHandler.isEntityExists(entity.domainId, entity.entityId))
+ if (!sharingRegistryServerHandler.isEntityExists(entity.getDomainId(), entity.getEntityId()))
sharingRegistryServerHandler.createEntity(entity);
- if (gatewayGroupsMap.containsKey(entity.domainId)) {
- shareEntityWithAdminGatewayGroups(sharingRegistryServerHandler, entity, gatewayGroupsMap.get(entity.domainId), false);
+ if (gatewayGroupsMap.containsKey(entity.getDomainId())) {
+ shareEntityWithAdminGatewayGroups(sharingRegistryServerHandler, entity, gatewayGroupsMap.get(entity.getDomainId()), false);
}
}
}
@@ -407,53 +407,53 @@ public class AiravataDataMigrator {
private static void shareEntityWithGatewayGroups(SharingRegistryServerHandler sharingRegistryServerHandler, Entity entity, GatewayGroups gatewayGroups, boolean cascadePermission) throws TException {
// Give default Gateway Users group READ access
- sharingRegistryServerHandler.shareEntityWithGroups(entity.domainId, entity.entityId,
+ sharingRegistryServerHandler.shareEntityWithGroups(entity.getDomainId(), entity.getEntityId(),
Arrays.asList(gatewayGroups.getDefaultGatewayUsersGroupId()),
- entity.domainId + ":" + ResourcePermissionType.READ, cascadePermission);
+ entity.getDomainId() + ":" + ResourcePermissionType.READ, cascadePermission);
shareEntityWithAdminGatewayGroups(sharingRegistryServerHandler, entity, gatewayGroups, cascadePermission);
}
private static void shareEntityWithAdminGatewayGroups(SharingRegistryServerHandler sharingRegistryServerHandler, Entity entity, GatewayGroups gatewayGroups, boolean cascadePermission) throws TException {
// Give Admins group and Read Only Admins group READ access
- sharingRegistryServerHandler.shareEntityWithGroups(entity.domainId, entity.entityId,
+ sharingRegistryServerHandler.shareEntityWithGroups(entity.getDomainId(), entity.getEntityId(),
Arrays.asList(gatewayGroups.getAdminsGroupId(), gatewayGroups.getReadOnlyAdminsGroupId()),
- entity.domainId + ":" + ResourcePermissionType.READ, cascadePermission);
+ entity.getDomainId() + ":" + ResourcePermissionType.READ, cascadePermission);
// Give Admins group WRITE access
- sharingRegistryServerHandler.shareEntityWithGroups(entity.domainId, entity.entityId,
+ sharingRegistryServerHandler.shareEntityWithGroups(entity.getDomainId(), entity.getEntityId(),
Arrays.asList(gatewayGroups.getAdminsGroupId()),
- entity.domainId + ":" + ResourcePermissionType.WRITE, cascadePermission);
+ entity.getDomainId() + ":" + ResourcePermissionType.WRITE, cascadePermission);
}
private static GatewayGroups migrateRolesToGatewayGroups(Domain domain, String ownerId, SharingRegistryServerHandler sharingRegistryServerHandler, RegistryService.Client registryServiceClient) throws TException, ApplicationSettingsException {
GatewayGroups gatewayGroups = new GatewayGroups();
- gatewayGroups.setGatewayId(domain.domainId);
+ gatewayGroups.setGatewayId(domain.getDomainId());
// Migrate roles to groups
- List<String> usernames = sharingRegistryServerHandler.getUsers(domain.domainId, 0, -1)
+ List<String> usernames = sharingRegistryServerHandler.getUsers(domain.getDomainId(), 0, -1)
.stream()
// Filter out bad ids that don't have an "@" in them
.filter(user -> user.getUserId().lastIndexOf("@") > 0)
.map(user -> user.getUserId().substring(0, user.getUserId().lastIndexOf("@")))
.collect(Collectors.toList());
- Map<String, List<String>> roleMap = loadRolesForUsers(domain.domainId, usernames);
+ Map<String, List<String>> roleMap = loadRolesForUsers(domain.getDomainId(), usernames);
UserGroup gatewayUsersGroup = createGroup(sharingRegistryServerHandler, domain, ownerId,
"Gateway Users",
"Default group for users of the gateway.",
roleMap.containsKey("gateway-user") ? roleMap.get("gateway-user") : Collections.emptyList());
- gatewayGroups.setDefaultGatewayUsersGroupId(gatewayUsersGroup.groupId);
+ gatewayGroups.setDefaultGatewayUsersGroupId(gatewayUsersGroup.getGroupId());
UserGroup adminUsersGroup = createGroup(sharingRegistryServerHandler, domain, ownerId,
"Admin Users",
"Admin users group.",
roleMap.containsKey("admin") ? roleMap.get("admin") : Collections.emptyList());
- gatewayGroups.setAdminsGroupId(adminUsersGroup.groupId);
+ gatewayGroups.setAdminsGroupId(adminUsersGroup.getGroupId());
UserGroup readOnlyAdminsGroup = createGroup(sharingRegistryServerHandler, domain, ownerId,
"Read Only Admin Users",
"Group of admin users with read-only access.",
roleMap.containsKey("admin-read-only") ? roleMap.get("admin-read-only") : Collections.emptyList());
- gatewayGroups.setReadOnlyAdminsGroupId(readOnlyAdminsGroup.groupId);
+ gatewayGroups.setReadOnlyAdminsGroupId(readOnlyAdminsGroup.getGroupId());
registryServiceClient.createGatewayGroups(gatewayGroups);
return gatewayGroups;
@@ -462,13 +462,13 @@ public class AiravataDataMigrator {
private static String getAdminOwnerUser(Domain domain, SharingRegistryServerHandler sharingRegistryServerHandler, CredentialStoreService.Client credentialStoreServiceClient, RegistryService.Client registryServiceClient) throws TException {
GatewayResourceProfile gatewayResourceProfile = null;
try {
- gatewayResourceProfile = registryServiceClient.getGatewayResourceProfile(domain.domainId);
+ gatewayResourceProfile = registryServiceClient.getGatewayResourceProfile(domain.getDomainId());
} catch (Exception e) {
- System.out.println("Skipping creating group based auth migration for " + domain.domainId + " because it doesn't have a GatewayResourceProfile");
+ System.out.println("Skipping creating group based auth migration for " + domain.getDomainId() + " because it doesn't have a GatewayResourceProfile");
return null;
}
if (gatewayResourceProfile.getIdentityServerPwdCredToken() == null) {
- System.out.println("Skipping creating group based auth migration for " + domain.domainId + " because it doesn't have an identity server pwd credential token");
+ System.out.println("Skipping creating group based auth migration for " + domain.getDomainId() + " because it doesn't have an identity server pwd credential token");
return null;
}
String groupOwner = null;
@@ -477,13 +477,13 @@ public class AiravataDataMigrator {
gatewayResourceProfile.getIdentityServerPwdCredToken(), gatewayResourceProfile.getGatewayID());
groupOwner = credential.getLoginUserName();
} catch (Exception e) {
- System.out.println("Skipping creating group based auth migration for " + domain.domainId + " because the identity server pwd credential could not be retrieved.");
+ System.out.println("Skipping creating group based auth migration for " + domain.getDomainId() + " because the identity server pwd credential could not be retrieved.");
return null;
}
- String ownerId = groupOwner + "@" + domain.domainId;
- if (!sharingRegistryServerHandler.isUserExists(domain.domainId, ownerId)) {
- System.out.println("Skipping creating group based auth migration for " + domain.domainId + " because admin user doesn't exist in sharing registry.");
+ String ownerId = groupOwner + "@" + domain.getDomainId();
+ if (!sharingRegistryServerHandler.isUserExists(domain.getDomainId(), ownerId)) {
+ System.out.println("Skipping creating group based auth migration for " + domain.getDomainId() + " because admin user doesn't exist in sharing registry.");
return null;
}
return ownerId;
@@ -527,7 +527,7 @@ public class AiravataDataMigrator {
UserGroup userGroup = new UserGroup();
userGroup.setGroupId(AiravataUtils.getId(groupName));
- userGroup.setDomainId(domain.domainId);
+ userGroup.setDomainId(domain.getDomainId());
userGroup.setGroupCardinality(GroupCardinality.MULTI_USER);
userGroup.setCreatedTime(System.currentTimeMillis());
userGroup.setUpdatedTime(System.currentTimeMillis());
@@ -538,10 +538,10 @@ public class AiravataDataMigrator {
sharingRegistryServerHandler.createGroup(userGroup);
List<String> userIds = usernames.stream()
- .map(username -> username + "@" + domain.domainId)
+ .map(username -> username + "@" + domain.getDomainId())
.collect(Collectors.toList());
- sharingRegistryServerHandler.addUsersToGroup(domain.domainId, userIds, userGroup.getGroupId());
+ sharingRegistryServerHandler.addUsersToGroup(domain.getDomainId(), userIds, userGroup.getGroupId());
return userGroup;
}
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/messaging/SharingServiceDBEventHandler.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/messaging/SharingServiceDBEventHandler.java
index c151361..f72a570 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/messaging/SharingServiceDBEventHandler.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/messaging/SharingServiceDBEventHandler.java
@@ -197,26 +197,26 @@ public class SharingServiceDBEventHandler implements MessageHandler {
log.warn("DuplicateEntryException while consuming TENANT create message, ex: " + ex.getMessage() + ", Entity Id : " + domain.getDomainId()+":FILE", ex);
}
- log.info("Creating entity type. Id : " + domain.domainId+":"+ResourceType.APPLICATION_DEPLOYMENT);
+ log.info("Creating entity type. Id : " + domain.getDomainId()+":"+ResourceType.APPLICATION_DEPLOYMENT);
entityType = new org.apache.airavata.sharing.registry.models.EntityType();
- entityType.setEntityTypeId(domain.domainId+":"+ ResourceType.APPLICATION_DEPLOYMENT.name());
- entityType.setDomainId(domain.domainId);
+ entityType.setEntityTypeId(domain.getDomainId()+":"+ ResourceType.APPLICATION_DEPLOYMENT.name());
+ entityType.setDomainId(domain.getDomainId());
entityType.setName("APPLICATION-DEPLOYMENT");
entityType.setDescription("Application Deployment entity type");
sharingRegistryClient.createEntityType(entityType);
- log.info("Creating entity type. Id : " + domain.domainId+":"+ResourceType.GROUP_RESOURCE_PROFILE);
+ log.info("Creating entity type. Id : " + domain.getDomainId()+":"+ResourceType.GROUP_RESOURCE_PROFILE);
entityType = new org.apache.airavata.sharing.registry.models.EntityType();
- entityType.setEntityTypeId(domain.domainId+":"+ResourceType.GROUP_RESOURCE_PROFILE.name());
- entityType.setDomainId(domain.domainId);
+ entityType.setEntityTypeId(domain.getDomainId()+":"+ResourceType.GROUP_RESOURCE_PROFILE.name());
+ entityType.setDomainId(domain.getDomainId());
entityType.setName(ResourceType.GROUP_RESOURCE_PROFILE.name());
entityType.setDescription("Group Resource Profile entity type");
sharingRegistryClient.createEntityType(entityType);
- log.info("Creating entity type. Id : " + domain.domainId+":"+ResourceType.CREDENTIAL_TOKEN);
+ log.info("Creating entity type. Id : " + domain.getDomainId()+":"+ResourceType.CREDENTIAL_TOKEN);
entityType = new org.apache.airavata.sharing.registry.models.EntityType();
- entityType.setEntityTypeId(domain.domainId+":"+ResourceType.CREDENTIAL_TOKEN.name());
- entityType.setDomainId(domain.domainId);
+ entityType.setEntityTypeId(domain.getDomainId()+":"+ResourceType.CREDENTIAL_TOKEN.name());
+ entityType.setDomainId(domain.getDomainId());
entityType.setName(ResourceType.CREDENTIAL_TOKEN.name());
entityType.setDescription("Credential Store Token entity type");
sharingRegistryClient.createEntityType(entityType);
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java
index 40eaef5..f4b08ae 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java
@@ -876,7 +876,9 @@ public class SharingRegistryServerHandler implements SharingRegistryService.Ifac
return entity.getEntityId();
}catch (Throwable ex) {
logger.error(ex.getMessage(), ex);
- throw new SharingRegistryException().setMessage(ex.getMessage() + " Stack trace:" + ExceptionUtils.getStackTrace(ex));
+ SharingRegistryException sharingRegistryException = new SharingRegistryException();
+ sharingRegistryException.setMessage(ex.getMessage() + " Stack trace:" + ExceptionUtils.getStackTrace(ex));
+ throw sharingRegistryException;
}
}
@@ -911,14 +913,14 @@ public class SharingRegistryServerHandler implements SharingRegistryService.Ifac
entity.setCreatedTime(oldEntity.getCreatedTime());
// check if parent entity changed and re-add inherited permissions
if (!Objects.equals(oldEntity.getParentEntityId(), entity.getParentEntityId())) {
- logger.debug("Parent entity changed for {}, updating inherited permissions", entity.entityId);
+ logger.debug("Parent entity changed for {}, updating inherited permissions", entity.getEntityId());
if (oldEntity.getParentEntityId() != null && oldEntity.getParentEntityId() != "") {
- logger.debug("Removing inherited permissions from {} that were inherited from parent {}", entity.entityId, oldEntity.getParentEntityId());
- (new SharingRepository()).removeAllIndirectCascadingPermissionsForEntity(entity.domainId, entity.entityId);
+ logger.debug("Removing inherited permissions from {} that were inherited from parent {}", entity.getEntityId(), oldEntity.getParentEntityId());
+ (new SharingRepository()).removeAllIndirectCascadingPermissionsForEntity(entity.getDomainId(), entity.getEntityId());
}
if (entity.getParentEntityId() != null && entity.getParentEntityId() != "") {
// re-add INDIRECT_CASCADING permissions
- logger.debug("Adding inherited permissions to {} that are inherited from parent {}", entity.entityId, entity.getParentEntityId());
+ logger.debug("Adding inherited permissions to {} that are inherited from parent {}", entity.getEntityId(), entity.getParentEntityId());
addCascadingPermissionsForEntity(entity);
}
}
@@ -1009,7 +1011,9 @@ public class SharingRegistryServerHandler implements SharingRegistryService.Ifac
return (new UserRepository()).getDirectlyAccessibleUsers(domainId, entityId, permissionTypeId);
}catch (Throwable ex) {
logger.error(ex.getMessage(), ex);
- throw new SharingRegistryException().setMessage(ex.getMessage() + " Stack trace:" + ExceptionUtils.getStackTrace(ex));
+ SharingRegistryException sharingRegistryException = new SharingRegistryException();
+ sharingRegistryException.setMessage(ex.getMessage() + " Stack trace:" + ExceptionUtils.getStackTrace(ex));
+ throw sharingRegistryException;
}
}
@@ -1030,7 +1034,9 @@ public class SharingRegistryServerHandler implements SharingRegistryService.Ifac
return (new UserGroupRepository()).getDirectlyAccessibleGroups(domainId, entityId, permissionTypeId);
}catch (Throwable ex) {
logger.error(ex.getMessage(), ex);
- throw new SharingRegistryException().setMessage(ex.getMessage() + " Stack trace:" + ExceptionUtils.getStackTrace(ex));
+ SharingRegistryException sharingRegistryException = new SharingRegistryException();
+ sharingRegistryException.setMessage(ex.getMessage() + " Stack trace:" + ExceptionUtils.getStackTrace(ex));
+ throw sharingRegistryException;
}
}