summaryrefslogtreecommitdiffstats
path: root/src/main/java/org/openslx/bwlp/thrift
diff options
context:
space:
mode:
authorSimon Rettberg2015-08-04 15:10:04 +0200
committerSimon Rettberg2015-08-04 15:10:04 +0200
commit0b7ed30cbfd1f543cbc3d80fb83ccf183dcb8df7 (patch)
tree8b54f5e513cc53bae5f55c369b91a10961ac95ed /src/main/java/org/openslx/bwlp/thrift
parent[VmMeta] Improvements to Vmware, implement getFilteredDescription (diff)
downloadmaster-sync-shared-0b7ed30cbfd1f543cbc3d80fb83ccf183dcb8df7.tar.gz
master-sync-shared-0b7ed30cbfd1f543cbc3d80fb83ccf183dcb8df7.tar.xz
master-sync-shared-0b7ed30cbfd1f543cbc3d80fb83ccf183dcb8df7.zip
Adapt to simplified DB scheme of sat server
Diffstat (limited to 'src/main/java/org/openslx/bwlp/thrift')
-rw-r--r--src/main/java/org/openslx/bwlp/thrift/iface/ImageDetailsRead.java162
-rw-r--r--src/main/java/org/openslx/bwlp/thrift/iface/ImageSummaryRead.java170
-rw-r--r--src/main/java/org/openslx/bwlp/thrift/iface/ImageVersionDetails.java118
-rw-r--r--src/main/java/org/openslx/bwlp/thrift/iface/ImageVersionWrite.java102
4 files changed, 82 insertions, 470 deletions
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/ImageDetailsRead.java b/src/main/java/org/openslx/bwlp/thrift/iface/ImageDetailsRead.java
index 386cf23..55f4d2b 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/ImageDetailsRead.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/ImageDetailsRead.java
@@ -36,7 +36,6 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ImageDetailsRead");
private static final org.apache.thrift.protocol.TField IMAGE_BASE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("imageBaseId", org.apache.thrift.protocol.TType.STRING, (short)1);
- private static final org.apache.thrift.protocol.TField CURRENT_VERSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("currentVersionId", org.apache.thrift.protocol.TType.STRING, (short)2);
private static final org.apache.thrift.protocol.TField LATEST_VERSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("latestVersionId", org.apache.thrift.protocol.TType.STRING, (short)17);
private static final org.apache.thrift.protocol.TField VERSIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("versions", org.apache.thrift.protocol.TType.LIST, (short)3);
private static final org.apache.thrift.protocol.TField IMAGE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("imageName", org.apache.thrift.protocol.TType.STRING, (short)4);
@@ -60,7 +59,6 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
}
public String imageBaseId; // required
- public String currentVersionId; // required
public String latestVersionId; // required
public List<ImageVersionDetails> versions; // required
public String imageName; // required
@@ -84,7 +82,6 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
IMAGE_BASE_ID((short)1, "imageBaseId"),
- CURRENT_VERSION_ID((short)2, "currentVersionId"),
LATEST_VERSION_ID((short)17, "latestVersionId"),
VERSIONS((short)3, "versions"),
IMAGE_NAME((short)4, "imageName"),
@@ -120,8 +117,6 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
switch(fieldId) {
case 1: // IMAGE_BASE_ID
return IMAGE_BASE_ID;
- case 2: // CURRENT_VERSION_ID
- return CURRENT_VERSION_ID;
case 17: // LATEST_VERSION_ID
return LATEST_VERSION_ID;
case 3: // VERSIONS
@@ -203,8 +198,6 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
tmpMap.put(_Fields.IMAGE_BASE_ID, new org.apache.thrift.meta_data.FieldMetaData("imageBaseId", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "UUID")));
- tmpMap.put(_Fields.CURRENT_VERSION_ID, new org.apache.thrift.meta_data.FieldMetaData("currentVersionId", org.apache.thrift.TFieldRequirementType.DEFAULT,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "UUID")));
tmpMap.put(_Fields.LATEST_VERSION_ID, new org.apache.thrift.meta_data.FieldMetaData("latestVersionId", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "UUID")));
tmpMap.put(_Fields.VERSIONS, new org.apache.thrift.meta_data.FieldMetaData("versions", org.apache.thrift.TFieldRequirementType.DEFAULT,
@@ -246,7 +239,6 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
public ImageDetailsRead(
String imageBaseId,
- String currentVersionId,
String latestVersionId,
List<ImageVersionDetails> versions,
String imageName,
@@ -264,7 +256,6 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
{
this();
this.imageBaseId = imageBaseId;
- this.currentVersionId = currentVersionId;
this.latestVersionId = latestVersionId;
this.versions = versions;
this.imageName = imageName;
@@ -293,9 +284,6 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
if (other.isSetImageBaseId()) {
this.imageBaseId = other.imageBaseId;
}
- if (other.isSetCurrentVersionId()) {
- this.currentVersionId = other.currentVersionId;
- }
if (other.isSetLatestVersionId()) {
this.latestVersionId = other.latestVersionId;
}
@@ -347,7 +335,6 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
@Override
public void clear() {
this.imageBaseId = null;
- this.currentVersionId = null;
this.latestVersionId = null;
this.versions = null;
this.imageName = null;
@@ -393,30 +380,6 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
}
}
- public String getCurrentVersionId() {
- return this.currentVersionId;
- }
-
- public ImageDetailsRead setCurrentVersionId(String currentVersionId) {
- this.currentVersionId = currentVersionId;
- return this;
- }
-
- public void unsetCurrentVersionId() {
- this.currentVersionId = null;
- }
-
- /** Returns true if field currentVersionId is set (has been assigned a value) and false otherwise */
- public boolean isSetCurrentVersionId() {
- return this.currentVersionId != null;
- }
-
- public void setCurrentVersionIdIsSet(boolean value) {
- if (!value) {
- this.currentVersionId = null;
- }
- }
-
public String getLatestVersionId() {
return this.latestVersionId;
}
@@ -821,14 +784,6 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
}
break;
- case CURRENT_VERSION_ID:
- if (value == null) {
- unsetCurrentVersionId();
- } else {
- setCurrentVersionId((String)value);
- }
- break;
-
case LATEST_VERSION_ID:
if (value == null) {
unsetLatestVersionId();
@@ -957,9 +912,6 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
case IMAGE_BASE_ID:
return getImageBaseId();
- case CURRENT_VERSION_ID:
- return getCurrentVersionId();
-
case LATEST_VERSION_ID:
return getLatestVersionId();
@@ -1018,8 +970,6 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
switch (field) {
case IMAGE_BASE_ID:
return isSetImageBaseId();
- case CURRENT_VERSION_ID:
- return isSetCurrentVersionId();
case LATEST_VERSION_ID:
return isSetLatestVersionId();
case VERSIONS:
@@ -1076,15 +1026,6 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
return false;
}
- boolean this_present_currentVersionId = true && this.isSetCurrentVersionId();
- boolean that_present_currentVersionId = true && that.isSetCurrentVersionId();
- if (this_present_currentVersionId || that_present_currentVersionId) {
- if (!(this_present_currentVersionId && that_present_currentVersionId))
- return false;
- if (!this.currentVersionId.equals(that.currentVersionId))
- return false;
- }
-
boolean this_present_latestVersionId = true && this.isSetLatestVersionId();
boolean that_present_latestVersionId = true && that.isSetLatestVersionId();
if (this_present_latestVersionId || that_present_latestVersionId) {
@@ -1246,16 +1187,6 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetCurrentVersionId()).compareTo(other.isSetCurrentVersionId());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetCurrentVersionId()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.currentVersionId, other.currentVersionId);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
lastComparison = Boolean.valueOf(isSetLatestVersionId()).compareTo(other.isSetLatestVersionId());
if (lastComparison != 0) {
return lastComparison;
@@ -1434,14 +1365,6 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
}
first = false;
if (!first) sb.append(", ");
- sb.append("currentVersionId:");
- if (this.currentVersionId == null) {
- sb.append("null");
- } else {
- sb.append(this.currentVersionId);
- }
- first = false;
- if (!first) sb.append(", ");
sb.append("latestVersionId:");
if (this.latestVersionId == null) {
sb.append("null");
@@ -1606,14 +1529,6 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 2: // CURRENT_VERSION_ID
- if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.currentVersionId = iprot.readString();
- struct.setCurrentVersionIdIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
case 17: // LATEST_VERSION_ID
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.latestVersionId = iprot.readString();
@@ -1777,11 +1692,6 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
oprot.writeString(struct.imageBaseId);
oprot.writeFieldEnd();
}
- if (struct.currentVersionId != null) {
- oprot.writeFieldBegin(CURRENT_VERSION_ID_FIELD_DESC);
- oprot.writeString(struct.currentVersionId);
- oprot.writeFieldEnd();
- }
if (struct.versions != null) {
oprot.writeFieldBegin(VERSIONS_FIELD_DESC);
{
@@ -1886,61 +1796,55 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
if (struct.isSetImageBaseId()) {
optionals.set(0);
}
- if (struct.isSetCurrentVersionId()) {
- optionals.set(1);
- }
if (struct.isSetLatestVersionId()) {
- optionals.set(2);
+ optionals.set(1);
}
if (struct.isSetVersions()) {
- optionals.set(3);
+ optionals.set(2);
}
if (struct.isSetImageName()) {
- optionals.set(4);
+ optionals.set(3);
}
if (struct.isSetDescription()) {
- optionals.set(5);
+ optionals.set(4);
}
if (struct.isSetTags()) {
- optionals.set(6);
+ optionals.set(5);
}
if (struct.isSetOsId()) {
- optionals.set(7);
+ optionals.set(6);
}
if (struct.isSetVirtId()) {
- optionals.set(8);
+ optionals.set(7);
}
if (struct.isSetCreateTime()) {
- optionals.set(9);
+ optionals.set(8);
}
if (struct.isSetUpdateTime()) {
- optionals.set(10);
+ optionals.set(9);
}
if (struct.isSetOwnerId()) {
- optionals.set(11);
+ optionals.set(10);
}
if (struct.isSetUpdaterId()) {
- optionals.set(12);
+ optionals.set(11);
}
if (struct.isSetShareMode()) {
- optionals.set(13);
+ optionals.set(12);
}
if (struct.isSetIsTemplate()) {
- optionals.set(14);
+ optionals.set(13);
}
if (struct.isSetDefaultPermissions()) {
- optionals.set(15);
+ optionals.set(14);
}
if (struct.isSetUserPermissions()) {
- optionals.set(16);
+ optionals.set(15);
}
- oprot.writeBitSet(optionals, 17);
+ oprot.writeBitSet(optionals, 16);
if (struct.isSetImageBaseId()) {
oprot.writeString(struct.imageBaseId);
}
- if (struct.isSetCurrentVersionId()) {
- oprot.writeString(struct.currentVersionId);
- }
if (struct.isSetLatestVersionId()) {
oprot.writeString(struct.latestVersionId);
}
@@ -2003,20 +1907,16 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, ImageDetailsRead struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
- BitSet incoming = iprot.readBitSet(17);
+ BitSet incoming = iprot.readBitSet(16);
if (incoming.get(0)) {
struct.imageBaseId = iprot.readString();
struct.setImageBaseIdIsSet(true);
}
if (incoming.get(1)) {
- struct.currentVersionId = iprot.readString();
- struct.setCurrentVersionIdIsSet(true);
- }
- if (incoming.get(2)) {
struct.latestVersionId = iprot.readString();
struct.setLatestVersionIdIsSet(true);
}
- if (incoming.get(3)) {
+ if (incoming.get(2)) {
{
org.apache.thrift.protocol.TList _list68 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
struct.versions = new ArrayList<ImageVersionDetails>(_list68.size);
@@ -2030,15 +1930,15 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
}
struct.setVersionsIsSet(true);
}
- if (incoming.get(4)) {
+ if (incoming.get(3)) {
struct.imageName = iprot.readString();
struct.setImageNameIsSet(true);
}
- if (incoming.get(5)) {
+ if (incoming.get(4)) {
struct.description = iprot.readString();
struct.setDescriptionIsSet(true);
}
- if (incoming.get(6)) {
+ if (incoming.get(5)) {
{
org.apache.thrift.protocol.TList _list71 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
struct.tags = new ArrayList<String>(_list71.size);
@@ -2051,44 +1951,44 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
}
struct.setTagsIsSet(true);
}
- if (incoming.get(7)) {
+ if (incoming.get(6)) {
struct.osId = iprot.readI32();
struct.setOsIdIsSet(true);
}
- if (incoming.get(8)) {
+ if (incoming.get(7)) {
struct.virtId = iprot.readString();
struct.setVirtIdIsSet(true);
}
- if (incoming.get(9)) {
+ if (incoming.get(8)) {
struct.createTime = iprot.readI64();
struct.setCreateTimeIsSet(true);
}
- if (incoming.get(10)) {
+ if (incoming.get(9)) {
struct.updateTime = iprot.readI64();
struct.setUpdateTimeIsSet(true);
}
- if (incoming.get(11)) {
+ if (incoming.get(10)) {
struct.ownerId = iprot.readString();
struct.setOwnerIdIsSet(true);
}
- if (incoming.get(12)) {
+ if (incoming.get(11)) {
struct.updaterId = iprot.readString();
struct.setUpdaterIdIsSet(true);
}
- if (incoming.get(13)) {
+ if (incoming.get(12)) {
struct.shareMode = ShareMode.findByValue(iprot.readI32());
struct.setShareModeIsSet(true);
}
- if (incoming.get(14)) {
+ if (incoming.get(13)) {
struct.isTemplate = iprot.readBool();
struct.setIsTemplateIsSet(true);
}
- if (incoming.get(15)) {
+ if (incoming.get(14)) {
struct.defaultPermissions = new ImagePermissions();
struct.defaultPermissions.read(iprot);
struct.setDefaultPermissionsIsSet(true);
}
- if (incoming.get(16)) {
+ if (incoming.get(15)) {
struct.userPermissions = new ImagePermissions();
struct.userPermissions.read(iprot);
struct.setUserPermissionsIsSet(true);
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/ImageSummaryRead.java b/src/main/java/org/openslx/bwlp/thrift/iface/ImageSummaryRead.java
index f398114..1e94350 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/ImageSummaryRead.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/ImageSummaryRead.java
@@ -36,7 +36,6 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ImageSummaryRead");
private static final org.apache.thrift.protocol.TField IMAGE_BASE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("imageBaseId", org.apache.thrift.protocol.TType.STRING, (short)1);
- private static final org.apache.thrift.protocol.TField CURRENT_VERSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("currentVersionId", org.apache.thrift.protocol.TType.STRING, (short)2);
private static final org.apache.thrift.protocol.TField LATEST_VERSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("latestVersionId", org.apache.thrift.protocol.TType.STRING, (short)3);
private static final org.apache.thrift.protocol.TField IMAGE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("imageName", org.apache.thrift.protocol.TType.STRING, (short)4);
private static final org.apache.thrift.protocol.TField OS_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("osId", org.apache.thrift.protocol.TType.I32, (short)5);
@@ -62,7 +61,6 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
}
public String imageBaseId; // required
- public String currentVersionId; // required
public String latestVersionId; // required
public String imageName; // required
public int osId; // required
@@ -88,7 +86,6 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
IMAGE_BASE_ID((short)1, "imageBaseId"),
- CURRENT_VERSION_ID((short)2, "currentVersionId"),
LATEST_VERSION_ID((short)3, "latestVersionId"),
IMAGE_NAME((short)4, "imageName"),
OS_ID((short)5, "osId"),
@@ -126,8 +123,6 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
switch(fieldId) {
case 1: // IMAGE_BASE_ID
return IMAGE_BASE_ID;
- case 2: // CURRENT_VERSION_ID
- return CURRENT_VERSION_ID;
case 3: // LATEST_VERSION_ID
return LATEST_VERSION_ID;
case 4: // IMAGE_NAME
@@ -218,8 +213,6 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
tmpMap.put(_Fields.IMAGE_BASE_ID, new org.apache.thrift.meta_data.FieldMetaData("imageBaseId", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "UUID")));
- tmpMap.put(_Fields.CURRENT_VERSION_ID, new org.apache.thrift.meta_data.FieldMetaData("currentVersionId", org.apache.thrift.TFieldRequirementType.DEFAULT,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "UUID")));
tmpMap.put(_Fields.LATEST_VERSION_ID, new org.apache.thrift.meta_data.FieldMetaData("latestVersionId", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "UUID")));
tmpMap.put(_Fields.IMAGE_NAME, new org.apache.thrift.meta_data.FieldMetaData("imageName", org.apache.thrift.TFieldRequirementType.DEFAULT,
@@ -263,7 +256,6 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
public ImageSummaryRead(
String imageBaseId,
- String currentVersionId,
String latestVersionId,
String imageName,
int osId,
@@ -283,7 +275,6 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
{
this();
this.imageBaseId = imageBaseId;
- this.currentVersionId = currentVersionId;
this.latestVersionId = latestVersionId;
this.imageName = imageName;
this.osId = osId;
@@ -319,9 +310,6 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
if (other.isSetImageBaseId()) {
this.imageBaseId = other.imageBaseId;
}
- if (other.isSetCurrentVersionId()) {
- this.currentVersionId = other.currentVersionId;
- }
if (other.isSetLatestVersionId()) {
this.latestVersionId = other.latestVersionId;
}
@@ -364,7 +352,6 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
@Override
public void clear() {
this.imageBaseId = null;
- this.currentVersionId = null;
this.latestVersionId = null;
this.imageName = null;
setOsIdIsSet(false);
@@ -417,30 +404,6 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
}
}
- public String getCurrentVersionId() {
- return this.currentVersionId;
- }
-
- public ImageSummaryRead setCurrentVersionId(String currentVersionId) {
- this.currentVersionId = currentVersionId;
- return this;
- }
-
- public void unsetCurrentVersionId() {
- this.currentVersionId = null;
- }
-
- /** Returns true if field currentVersionId is set (has been assigned a value) and false otherwise */
- public boolean isSetCurrentVersionId() {
- return this.currentVersionId != null;
- }
-
- public void setCurrentVersionIdIsSet(boolean value) {
- if (!value) {
- this.currentVersionId = null;
- }
- }
-
public String getLatestVersionId() {
return this.latestVersionId;
}
@@ -858,14 +821,6 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
}
break;
- case CURRENT_VERSION_ID:
- if (value == null) {
- unsetCurrentVersionId();
- } else {
- setCurrentVersionId((String)value);
- }
- break;
-
case LATEST_VERSION_ID:
if (value == null) {
unsetLatestVersionId();
@@ -1010,9 +965,6 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
case IMAGE_BASE_ID:
return getImageBaseId();
- case CURRENT_VERSION_ID:
- return getCurrentVersionId();
-
case LATEST_VERSION_ID:
return getLatestVersionId();
@@ -1077,8 +1029,6 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
switch (field) {
case IMAGE_BASE_ID:
return isSetImageBaseId();
- case CURRENT_VERSION_ID:
- return isSetCurrentVersionId();
case LATEST_VERSION_ID:
return isSetLatestVersionId();
case IMAGE_NAME:
@@ -1139,15 +1089,6 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
return false;
}
- boolean this_present_currentVersionId = true && this.isSetCurrentVersionId();
- boolean that_present_currentVersionId = true && that.isSetCurrentVersionId();
- if (this_present_currentVersionId || that_present_currentVersionId) {
- if (!(this_present_currentVersionId && that_present_currentVersionId))
- return false;
- if (!this.currentVersionId.equals(that.currentVersionId))
- return false;
- }
-
boolean this_present_latestVersionId = true && this.isSetLatestVersionId();
boolean that_present_latestVersionId = true && that.isSetLatestVersionId();
if (this_present_latestVersionId || that_present_latestVersionId) {
@@ -1327,16 +1268,6 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetCurrentVersionId()).compareTo(other.isSetCurrentVersionId());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetCurrentVersionId()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.currentVersionId, other.currentVersionId);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
lastComparison = Boolean.valueOf(isSetLatestVersionId()).compareTo(other.isSetLatestVersionId());
if (lastComparison != 0) {
return lastComparison;
@@ -1535,14 +1466,6 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
}
first = false;
if (!first) sb.append(", ");
- sb.append("currentVersionId:");
- if (this.currentVersionId == null) {
- sb.append("null");
- } else {
- sb.append(this.currentVersionId);
- }
- first = false;
- if (!first) sb.append(", ");
sb.append("latestVersionId:");
if (this.latestVersionId == null) {
sb.append("null");
@@ -1703,14 +1626,6 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 2: // CURRENT_VERSION_ID
- if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.currentVersionId = iprot.readString();
- struct.setCurrentVersionIdIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
case 3: // LATEST_VERSION_ID
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.latestVersionId = iprot.readString();
@@ -1869,11 +1784,6 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
oprot.writeString(struct.imageBaseId);
oprot.writeFieldEnd();
}
- if (struct.currentVersionId != null) {
- oprot.writeFieldBegin(CURRENT_VERSION_ID_FIELD_DESC);
- oprot.writeString(struct.currentVersionId);
- oprot.writeFieldEnd();
- }
if (struct.latestVersionId != null) {
oprot.writeFieldBegin(LATEST_VERSION_ID_FIELD_DESC);
oprot.writeString(struct.latestVersionId);
@@ -1964,67 +1874,61 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
if (struct.isSetImageBaseId()) {
optionals.set(0);
}
- if (struct.isSetCurrentVersionId()) {
- optionals.set(1);
- }
if (struct.isSetLatestVersionId()) {
- optionals.set(2);
+ optionals.set(1);
}
if (struct.isSetImageName()) {
- optionals.set(3);
+ optionals.set(2);
}
if (struct.isSetOsId()) {
- optionals.set(4);
+ optionals.set(3);
}
if (struct.isSetVirtId()) {
- optionals.set(5);
+ optionals.set(4);
}
if (struct.isSetCreateTime()) {
- optionals.set(6);
+ optionals.set(5);
}
if (struct.isSetUpdateTime()) {
- optionals.set(7);
+ optionals.set(6);
}
if (struct.isSetExpireTime()) {
- optionals.set(8);
+ optionals.set(7);
}
if (struct.isSetOwnerId()) {
- optionals.set(9);
+ optionals.set(8);
}
if (struct.isSetUploaderId()) {
- optionals.set(10);
+ optionals.set(9);
}
if (struct.isSetShareMode()) {
- optionals.set(11);
+ optionals.set(10);
}
if (struct.isSetFileSize()) {
- optionals.set(12);
+ optionals.set(11);
}
if (struct.isSetIsRestricted()) {
- optionals.set(13);
+ optionals.set(12);
}
if (struct.isSetIsValid()) {
- optionals.set(14);
+ optionals.set(13);
}
if (struct.isSetIsProcessed()) {
- optionals.set(15);
+ optionals.set(14);
}
if (struct.isSetIsTemplate()) {
- optionals.set(16);
+ optionals.set(15);
}
if (struct.isSetDefaultPermissions()) {
- optionals.set(17);
+ optionals.set(16);
}
if (struct.isSetUserPermissions()) {
- optionals.set(18);
+ optionals.set(17);
}
- oprot.writeBitSet(optionals, 19);
+ oprot.writeBitSet(optionals, 18);
if (struct.isSetImageBaseId()) {
oprot.writeString(struct.imageBaseId);
}
- if (struct.isSetCurrentVersionId()) {
- oprot.writeString(struct.currentVersionId);
- }
if (struct.isSetLatestVersionId()) {
oprot.writeString(struct.latestVersionId);
}
@@ -2081,81 +1985,77 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, ImageSummaryRead struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
- BitSet incoming = iprot.readBitSet(19);
+ BitSet incoming = iprot.readBitSet(18);
if (incoming.get(0)) {
struct.imageBaseId = iprot.readString();
struct.setImageBaseIdIsSet(true);
}
if (incoming.get(1)) {
- struct.currentVersionId = iprot.readString();
- struct.setCurrentVersionIdIsSet(true);
- }
- if (incoming.get(2)) {
struct.latestVersionId = iprot.readString();
struct.setLatestVersionIdIsSet(true);
}
- if (incoming.get(3)) {
+ if (incoming.get(2)) {
struct.imageName = iprot.readString();
struct.setImageNameIsSet(true);
}
- if (incoming.get(4)) {
+ if (incoming.get(3)) {
struct.osId = iprot.readI32();
struct.setOsIdIsSet(true);
}
- if (incoming.get(5)) {
+ if (incoming.get(4)) {
struct.virtId = iprot.readString();
struct.setVirtIdIsSet(true);
}
- if (incoming.get(6)) {
+ if (incoming.get(5)) {
struct.createTime = iprot.readI64();
struct.setCreateTimeIsSet(true);
}
- if (incoming.get(7)) {
+ if (incoming.get(6)) {
struct.updateTime = iprot.readI64();
struct.setUpdateTimeIsSet(true);
}
- if (incoming.get(8)) {
+ if (incoming.get(7)) {
struct.expireTime = iprot.readI64();
struct.setExpireTimeIsSet(true);
}
- if (incoming.get(9)) {
+ if (incoming.get(8)) {
struct.ownerId = iprot.readString();
struct.setOwnerIdIsSet(true);
}
- if (incoming.get(10)) {
+ if (incoming.get(9)) {
struct.uploaderId = iprot.readString();
struct.setUploaderIdIsSet(true);
}
- if (incoming.get(11)) {
+ if (incoming.get(10)) {
struct.shareMode = ShareMode.findByValue(iprot.readI32());
struct.setShareModeIsSet(true);
}
- if (incoming.get(12)) {
+ if (incoming.get(11)) {
struct.fileSize = iprot.readI64();
struct.setFileSizeIsSet(true);
}
- if (incoming.get(13)) {
+ if (incoming.get(12)) {
struct.isRestricted = iprot.readBool();
struct.setIsRestrictedIsSet(true);
}
- if (incoming.get(14)) {
+ if (incoming.get(13)) {
struct.isValid = iprot.readBool();
struct.setIsValidIsSet(true);
}
- if (incoming.get(15)) {
+ if (incoming.get(14)) {
struct.isProcessed = iprot.readBool();
struct.setIsProcessedIsSet(true);
}
- if (incoming.get(16)) {
+ if (incoming.get(15)) {
struct.isTemplate = iprot.readBool();
struct.setIsTemplateIsSet(true);
}
- if (incoming.get(17)) {
+ if (incoming.get(16)) {
struct.defaultPermissions = new ImagePermissions();
struct.defaultPermissions.read(iprot);
struct.setDefaultPermissionsIsSet(true);
}
- if (incoming.get(18)) {
+ if (incoming.get(17)) {
struct.userPermissions = new ImagePermissions();
struct.userPermissions.read(iprot);
struct.setUserPermissionsIsSet(true);
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/ImageVersionDetails.java b/src/main/java/org/openslx/bwlp/thrift/iface/ImageVersionDetails.java
index db082be..bb78a52 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/ImageVersionDetails.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/ImageVersionDetails.java
@@ -40,7 +40,6 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
private static final org.apache.thrift.protocol.TField EXPIRE_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("expireTime", org.apache.thrift.protocol.TType.I64, (short)3);
private static final org.apache.thrift.protocol.TField FILE_SIZE_FIELD_DESC = new org.apache.thrift.protocol.TField("fileSize", org.apache.thrift.protocol.TType.I64, (short)4);
private static final org.apache.thrift.protocol.TField UPLOADER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("uploaderId", org.apache.thrift.protocol.TType.STRING, (short)5);
- private static final org.apache.thrift.protocol.TField IS_ENABLED_FIELD_DESC = new org.apache.thrift.protocol.TField("isEnabled", org.apache.thrift.protocol.TType.BOOL, (short)6);
private static final org.apache.thrift.protocol.TField IS_RESTRICTED_FIELD_DESC = new org.apache.thrift.protocol.TField("isRestricted", org.apache.thrift.protocol.TType.BOOL, (short)7);
private static final org.apache.thrift.protocol.TField IS_VALID_FIELD_DESC = new org.apache.thrift.protocol.TField("isValid", org.apache.thrift.protocol.TType.BOOL, (short)8);
private static final org.apache.thrift.protocol.TField IS_PROCESSED_FIELD_DESC = new org.apache.thrift.protocol.TField("isProcessed", org.apache.thrift.protocol.TType.BOOL, (short)9);
@@ -57,7 +56,6 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
public long expireTime; // required
public long fileSize; // required
public String uploaderId; // required
- public boolean isEnabled; // required
public boolean isRestricted; // required
public boolean isValid; // required
public boolean isProcessed; // required
@@ -70,7 +68,6 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
EXPIRE_TIME((short)3, "expireTime"),
FILE_SIZE((short)4, "fileSize"),
UPLOADER_ID((short)5, "uploaderId"),
- IS_ENABLED((short)6, "isEnabled"),
IS_RESTRICTED((short)7, "isRestricted"),
IS_VALID((short)8, "isValid"),
IS_PROCESSED((short)9, "isProcessed"),
@@ -99,8 +96,6 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
return FILE_SIZE;
case 5: // UPLOADER_ID
return UPLOADER_ID;
- case 6: // IS_ENABLED
- return IS_ENABLED;
case 7: // IS_RESTRICTED
return IS_RESTRICTED;
case 8: // IS_VALID
@@ -152,10 +147,9 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
private static final int __CREATETIME_ISSET_ID = 0;
private static final int __EXPIRETIME_ISSET_ID = 1;
private static final int __FILESIZE_ISSET_ID = 2;
- private static final int __ISENABLED_ISSET_ID = 3;
- private static final int __ISRESTRICTED_ISSET_ID = 4;
- private static final int __ISVALID_ISSET_ID = 5;
- private static final int __ISPROCESSED_ISSET_ID = 6;
+ private static final int __ISRESTRICTED_ISSET_ID = 3;
+ private static final int __ISVALID_ISSET_ID = 4;
+ private static final int __ISPROCESSED_ISSET_ID = 5;
private byte __isset_bitfield = 0;
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
@@ -170,8 +164,6 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
tmpMap.put(_Fields.UPLOADER_ID, new org.apache.thrift.meta_data.FieldMetaData("uploaderId", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "UUID")));
- tmpMap.put(_Fields.IS_ENABLED, new org.apache.thrift.meta_data.FieldMetaData("isEnabled", org.apache.thrift.TFieldRequirementType.DEFAULT,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
tmpMap.put(_Fields.IS_RESTRICTED, new org.apache.thrift.meta_data.FieldMetaData("isRestricted", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
tmpMap.put(_Fields.IS_VALID, new org.apache.thrift.meta_data.FieldMetaData("isValid", org.apache.thrift.TFieldRequirementType.DEFAULT,
@@ -194,7 +186,6 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
long expireTime,
long fileSize,
String uploaderId,
- boolean isEnabled,
boolean isRestricted,
boolean isValid,
boolean isProcessed,
@@ -209,8 +200,6 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
this.fileSize = fileSize;
setFileSizeIsSet(true);
this.uploaderId = uploaderId;
- this.isEnabled = isEnabled;
- setIsEnabledIsSet(true);
this.isRestricted = isRestricted;
setIsRestrictedIsSet(true);
this.isValid = isValid;
@@ -234,7 +223,6 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
if (other.isSetUploaderId()) {
this.uploaderId = other.uploaderId;
}
- this.isEnabled = other.isEnabled;
this.isRestricted = other.isRestricted;
this.isValid = other.isValid;
this.isProcessed = other.isProcessed;
@@ -258,8 +246,6 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
setFileSizeIsSet(false);
this.fileSize = 0;
this.uploaderId = null;
- setIsEnabledIsSet(false);
- this.isEnabled = false;
setIsRestrictedIsSet(false);
this.isRestricted = false;
setIsValidIsSet(false);
@@ -386,29 +372,6 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
}
}
- public boolean isIsEnabled() {
- return this.isEnabled;
- }
-
- public ImageVersionDetails setIsEnabled(boolean isEnabled) {
- this.isEnabled = isEnabled;
- setIsEnabledIsSet(true);
- return this;
- }
-
- public void unsetIsEnabled() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ISENABLED_ISSET_ID);
- }
-
- /** Returns true if field isEnabled is set (has been assigned a value) and false otherwise */
- public boolean isSetIsEnabled() {
- return EncodingUtils.testBit(__isset_bitfield, __ISENABLED_ISSET_ID);
- }
-
- public void setIsEnabledIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISENABLED_ISSET_ID, value);
- }
-
public boolean isIsRestricted() {
return this.isRestricted;
}
@@ -559,14 +522,6 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
}
break;
- case IS_ENABLED:
- if (value == null) {
- unsetIsEnabled();
- } else {
- setIsEnabled((Boolean)value);
- }
- break;
-
case IS_RESTRICTED:
if (value == null) {
unsetIsRestricted();
@@ -619,9 +574,6 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
case UPLOADER_ID:
return getUploaderId();
- case IS_ENABLED:
- return Boolean.valueOf(isIsEnabled());
-
case IS_RESTRICTED:
return Boolean.valueOf(isIsRestricted());
@@ -655,8 +607,6 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
return isSetFileSize();
case UPLOADER_ID:
return isSetUploaderId();
- case IS_ENABLED:
- return isSetIsEnabled();
case IS_RESTRICTED:
return isSetIsRestricted();
case IS_VALID:
@@ -727,15 +677,6 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
return false;
}
- boolean this_present_isEnabled = true;
- boolean that_present_isEnabled = true;
- if (this_present_isEnabled || that_present_isEnabled) {
- if (!(this_present_isEnabled && that_present_isEnabled))
- return false;
- if (this.isEnabled != that.isEnabled)
- return false;
- }
-
boolean this_present_isRestricted = true;
boolean that_present_isRestricted = true;
if (this_present_isRestricted || that_present_isRestricted) {
@@ -838,16 +779,6 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetIsEnabled()).compareTo(other.isSetIsEnabled());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetIsEnabled()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.isEnabled, other.isEnabled);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
lastComparison = Boolean.valueOf(isSetIsRestricted()).compareTo(other.isSetIsRestricted());
if (lastComparison != 0) {
return lastComparison;
@@ -936,10 +867,6 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
}
first = false;
if (!first) sb.append(", ");
- sb.append("isEnabled:");
- sb.append(this.isEnabled);
- first = false;
- if (!first) sb.append(", ");
sb.append("isRestricted:");
sb.append(this.isRestricted);
first = false;
@@ -1044,14 +971,6 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 6: // IS_ENABLED
- if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
- struct.isEnabled = iprot.readBool();
- struct.setIsEnabledIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
case 7: // IS_RESTRICTED
if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
struct.isRestricted = iprot.readBool();
@@ -1128,9 +1047,6 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
oprot.writeString(struct.uploaderId);
oprot.writeFieldEnd();
}
- oprot.writeFieldBegin(IS_ENABLED_FIELD_DESC);
- oprot.writeBool(struct.isEnabled);
- oprot.writeFieldEnd();
oprot.writeFieldBegin(IS_RESTRICTED_FIELD_DESC);
oprot.writeBool(struct.isRestricted);
oprot.writeFieldEnd();
@@ -1185,22 +1101,19 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
if (struct.isSetUploaderId()) {
optionals.set(4);
}
- if (struct.isSetIsEnabled()) {
- optionals.set(5);
- }
if (struct.isSetIsRestricted()) {
- optionals.set(6);
+ optionals.set(5);
}
if (struct.isSetIsValid()) {
- optionals.set(7);
+ optionals.set(6);
}
if (struct.isSetIsProcessed()) {
- optionals.set(8);
+ optionals.set(7);
}
if (struct.isSetSoftware()) {
- optionals.set(9);
+ optionals.set(8);
}
- oprot.writeBitSet(optionals, 10);
+ oprot.writeBitSet(optionals, 9);
if (struct.isSetVersionId()) {
oprot.writeString(struct.versionId);
}
@@ -1216,9 +1129,6 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
if (struct.isSetUploaderId()) {
oprot.writeString(struct.uploaderId);
}
- if (struct.isSetIsEnabled()) {
- oprot.writeBool(struct.isEnabled);
- }
if (struct.isSetIsRestricted()) {
oprot.writeBool(struct.isRestricted);
}
@@ -1242,7 +1152,7 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, ImageVersionDetails struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
- BitSet incoming = iprot.readBitSet(10);
+ BitSet incoming = iprot.readBitSet(9);
if (incoming.get(0)) {
struct.versionId = iprot.readString();
struct.setVersionIdIsSet(true);
@@ -1264,22 +1174,18 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
struct.setUploaderIdIsSet(true);
}
if (incoming.get(5)) {
- struct.isEnabled = iprot.readBool();
- struct.setIsEnabledIsSet(true);
- }
- if (incoming.get(6)) {
struct.isRestricted = iprot.readBool();
struct.setIsRestrictedIsSet(true);
}
- if (incoming.get(7)) {
+ if (incoming.get(6)) {
struct.isValid = iprot.readBool();
struct.setIsValidIsSet(true);
}
- if (incoming.get(8)) {
+ if (incoming.get(7)) {
struct.isProcessed = iprot.readBool();
struct.setIsProcessedIsSet(true);
}
- if (incoming.get(9)) {
+ if (incoming.get(8)) {
{
org.apache.thrift.protocol.TList _list55 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
struct.software = new ArrayList<String>(_list55.size);
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/ImageVersionWrite.java b/src/main/java/org/openslx/bwlp/thrift/iface/ImageVersionWrite.java
index 603e027..b159bdb 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/ImageVersionWrite.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/ImageVersionWrite.java
@@ -35,7 +35,6 @@ import org.slf4j.LoggerFactory;
public class ImageVersionWrite implements org.apache.thrift.TBase<ImageVersionWrite, ImageVersionWrite._Fields>, java.io.Serializable, Cloneable, Comparable<ImageVersionWrite> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ImageVersionWrite");
- private static final org.apache.thrift.protocol.TField IS_ENABLED_FIELD_DESC = new org.apache.thrift.protocol.TField("isEnabled", org.apache.thrift.protocol.TType.BOOL, (short)1);
private static final org.apache.thrift.protocol.TField IS_RESTRICTED_FIELD_DESC = new org.apache.thrift.protocol.TField("isRestricted", org.apache.thrift.protocol.TType.BOOL, (short)2);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
@@ -44,12 +43,10 @@ public class ImageVersionWrite implements org.apache.thrift.TBase<ImageVersionWr
schemes.put(TupleScheme.class, new ImageVersionWriteTupleSchemeFactory());
}
- public boolean isEnabled; // required
public boolean isRestricted; // 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 {
- IS_ENABLED((short)1, "isEnabled"),
IS_RESTRICTED((short)2, "isRestricted");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -65,8 +62,6 @@ public class ImageVersionWrite implements org.apache.thrift.TBase<ImageVersionWr
*/
public static _Fields findByThriftId(int fieldId) {
switch(fieldId) {
- case 1: // IS_ENABLED
- return IS_ENABLED;
case 2: // IS_RESTRICTED
return IS_RESTRICTED;
default:
@@ -109,14 +104,11 @@ public class ImageVersionWrite implements org.apache.thrift.TBase<ImageVersionWr
}
// isset id assignments
- private static final int __ISENABLED_ISSET_ID = 0;
- private static final int __ISRESTRICTED_ISSET_ID = 1;
+ private static final int __ISRESTRICTED_ISSET_ID = 0;
private byte __isset_bitfield = 0;
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
- tmpMap.put(_Fields.IS_ENABLED, new org.apache.thrift.meta_data.FieldMetaData("isEnabled", org.apache.thrift.TFieldRequirementType.DEFAULT,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
tmpMap.put(_Fields.IS_RESTRICTED, new org.apache.thrift.meta_data.FieldMetaData("isRestricted", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
@@ -127,12 +119,9 @@ public class ImageVersionWrite implements org.apache.thrift.TBase<ImageVersionWr
}
public ImageVersionWrite(
- boolean isEnabled,
boolean isRestricted)
{
this();
- this.isEnabled = isEnabled;
- setIsEnabledIsSet(true);
this.isRestricted = isRestricted;
setIsRestrictedIsSet(true);
}
@@ -142,7 +131,6 @@ public class ImageVersionWrite implements org.apache.thrift.TBase<ImageVersionWr
*/
public ImageVersionWrite(ImageVersionWrite other) {
__isset_bitfield = other.__isset_bitfield;
- this.isEnabled = other.isEnabled;
this.isRestricted = other.isRestricted;
}
@@ -152,35 +140,10 @@ public class ImageVersionWrite implements org.apache.thrift.TBase<ImageVersionWr
@Override
public void clear() {
- setIsEnabledIsSet(false);
- this.isEnabled = false;
setIsRestrictedIsSet(false);
this.isRestricted = false;
}
- public boolean isIsEnabled() {
- return this.isEnabled;
- }
-
- public ImageVersionWrite setIsEnabled(boolean isEnabled) {
- this.isEnabled = isEnabled;
- setIsEnabledIsSet(true);
- return this;
- }
-
- public void unsetIsEnabled() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ISENABLED_ISSET_ID);
- }
-
- /** Returns true if field isEnabled is set (has been assigned a value) and false otherwise */
- public boolean isSetIsEnabled() {
- return EncodingUtils.testBit(__isset_bitfield, __ISENABLED_ISSET_ID);
- }
-
- public void setIsEnabledIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISENABLED_ISSET_ID, value);
- }
-
public boolean isIsRestricted() {
return this.isRestricted;
}
@@ -206,14 +169,6 @@ public class ImageVersionWrite implements org.apache.thrift.TBase<ImageVersionWr
public void setFieldValue(_Fields field, Object value) {
switch (field) {
- case IS_ENABLED:
- if (value == null) {
- unsetIsEnabled();
- } else {
- setIsEnabled((Boolean)value);
- }
- break;
-
case IS_RESTRICTED:
if (value == null) {
unsetIsRestricted();
@@ -227,9 +182,6 @@ public class ImageVersionWrite implements org.apache.thrift.TBase<ImageVersionWr
public Object getFieldValue(_Fields field) {
switch (field) {
- case IS_ENABLED:
- return Boolean.valueOf(isIsEnabled());
-
case IS_RESTRICTED:
return Boolean.valueOf(isIsRestricted());
@@ -244,8 +196,6 @@ public class ImageVersionWrite implements org.apache.thrift.TBase<ImageVersionWr
}
switch (field) {
- case IS_ENABLED:
- return isSetIsEnabled();
case IS_RESTRICTED:
return isSetIsRestricted();
}
@@ -265,15 +215,6 @@ public class ImageVersionWrite implements org.apache.thrift.TBase<ImageVersionWr
if (that == null)
return false;
- boolean this_present_isEnabled = true;
- boolean that_present_isEnabled = true;
- if (this_present_isEnabled || that_present_isEnabled) {
- if (!(this_present_isEnabled && that_present_isEnabled))
- return false;
- if (this.isEnabled != that.isEnabled)
- return false;
- }
-
boolean this_present_isRestricted = true;
boolean that_present_isRestricted = true;
if (this_present_isRestricted || that_present_isRestricted) {
@@ -299,16 +240,6 @@ public class ImageVersionWrite implements org.apache.thrift.TBase<ImageVersionWr
int lastComparison = 0;
- lastComparison = Boolean.valueOf(isSetIsEnabled()).compareTo(other.isSetIsEnabled());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetIsEnabled()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.isEnabled, other.isEnabled);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
lastComparison = Boolean.valueOf(isSetIsRestricted()).compareTo(other.isSetIsRestricted());
if (lastComparison != 0) {
return lastComparison;
@@ -339,10 +270,6 @@ public class ImageVersionWrite implements org.apache.thrift.TBase<ImageVersionWr
StringBuilder sb = new StringBuilder("ImageVersionWrite(");
boolean first = true;
- sb.append("isEnabled:");
- sb.append(this.isEnabled);
- first = false;
- if (!first) sb.append(", ");
sb.append("isRestricted:");
sb.append(this.isRestricted);
first = false;
@@ -391,14 +318,6 @@ public class ImageVersionWrite implements org.apache.thrift.TBase<ImageVersionWr
break;
}
switch (schemeField.id) {
- case 1: // IS_ENABLED
- if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
- struct.isEnabled = iprot.readBool();
- struct.setIsEnabledIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
case 2: // IS_RESTRICTED
if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
struct.isRestricted = iprot.readBool();
@@ -422,9 +341,6 @@ public class ImageVersionWrite implements org.apache.thrift.TBase<ImageVersionWr
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
- oprot.writeFieldBegin(IS_ENABLED_FIELD_DESC);
- oprot.writeBool(struct.isEnabled);
- oprot.writeFieldEnd();
oprot.writeFieldBegin(IS_RESTRICTED_FIELD_DESC);
oprot.writeBool(struct.isRestricted);
oprot.writeFieldEnd();
@@ -446,16 +362,10 @@ public class ImageVersionWrite implements org.apache.thrift.TBase<ImageVersionWr
public void write(org.apache.thrift.protocol.TProtocol prot, ImageVersionWrite struct) throws org.apache.thrift.TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
BitSet optionals = new BitSet();
- if (struct.isSetIsEnabled()) {
- optionals.set(0);
- }
if (struct.isSetIsRestricted()) {
- optionals.set(1);
- }
- oprot.writeBitSet(optionals, 2);
- if (struct.isSetIsEnabled()) {
- oprot.writeBool(struct.isEnabled);
+ optionals.set(0);
}
+ oprot.writeBitSet(optionals, 1);
if (struct.isSetIsRestricted()) {
oprot.writeBool(struct.isRestricted);
}
@@ -464,12 +374,8 @@ public class ImageVersionWrite implements org.apache.thrift.TBase<ImageVersionWr
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, ImageVersionWrite struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
- BitSet incoming = iprot.readBitSet(2);
+ BitSet incoming = iprot.readBitSet(1);
if (incoming.get(0)) {
- struct.isEnabled = iprot.readBool();
- struct.setIsEnabledIsSet(true);
- }
- if (incoming.get(1)) {
struct.isRestricted = iprot.readBool();
struct.setIsRestrictedIsSet(true);
}