Adapt to simplified DB scheme of sat server

1 files changed, 35 insertions, 135 deletions

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);