@lansweeper/data-platform-outbound-grpc 0.3.4 → 0.3.6

package/java.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.3.3",
+  "version": "0.3.5",
   "package": "com.lansweeper.dp.outbound.v1",
   "name": "outbound",
   "service": true

package/model/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.lansweeper.dp.outbound.v1</groupId>
         <artifactId>parent</artifactId>
-        <version>0.3.3</version>
+        <version>0.3.5</version>
     </parent>
 
     <artifactId>outbound-model</artifactId>

package/model/src/main/proto/outbound.proto

@@ -3479,6 +3479,7 @@ message ActiveDirectoryUser {
   optional string sam_account_name = 2;
   optional string cn = 3;
   optional string ou = 4;
+  optional string domain = 58;
   optional string description = 5;
   optional string comment = 6;
   optional string company = 7;
@@ -3546,7 +3547,8 @@ message ActiveDirectoryGroup {
   optional string ou = 4;
   optional string description = 5;
   optional string comment = 6;
-  optional int32 group_type = 7;
+  reserved 7;
+  optional MappedValue type = 12;
   optional string email = 8;
 
   optional string managed_by_user_oid = 9;

package/model/target/classes/outbound.proto

@@ -3479,6 +3479,7 @@ message ActiveDirectoryUser {
   optional string sam_account_name = 2;
   optional string cn = 3;
   optional string ou = 4;
+  optional string domain = 58;
   optional string description = 5;
   optional string comment = 6;
   optional string company = 7;
@@ -3546,7 +3547,8 @@ message ActiveDirectoryGroup {
   optional string ou = 4;
   optional string description = 5;
   optional string comment = 6;
-  optional int32 group_type = 7;
+  reserved 7;
+  optional MappedValue type = 12;
   optional string email = 8;
 
   optional string managed_by_user_oid = 9;

package/model/target/generated-sources/protobuf/java/com/lansweeper/dp/outbound/v1/ActiveDirectoryGroup.java

@@ -316,23 +316,30 @@ private static final long serialVersionUID = 0L;
     }
   }
 
-  public static final int GROUP_TYPE_FIELD_NUMBER = 7;
-  private int groupType_ = 0;
+  public static final int TYPE_FIELD_NUMBER = 12;
+  private com.lansweeper.dp.outbound.v1.MappedValue type_;
   /**
-   * <code>optional int32 group_type = 7;</code>
-   * @return Whether the groupType field is set.
+   * <code>optional .com.lansweeper.dp.outbound.v1.MappedValue type = 12;</code>
+   * @return Whether the type field is set.
    */
   @java.lang.Override
-  public boolean hasGroupType() {
+  public boolean hasType() {
     return ((bitField0_ & 0x00000040) != 0);
   }
   /**
-   * <code>optional int32 group_type = 7;</code>
-   * @return The groupType.
+   * <code>optional .com.lansweeper.dp.outbound.v1.MappedValue type = 12;</code>
+   * @return The type.
    */
   @java.lang.Override
-  public int getGroupType() {
-    return groupType_;
+  public com.lansweeper.dp.outbound.v1.MappedValue getType() {
+    return type_ == null ? com.lansweeper.dp.outbound.v1.MappedValue.getDefaultInstance() : type_;
+  }
+  /**
+   * <code>optional .com.lansweeper.dp.outbound.v1.MappedValue type = 12;</code>
+   */
+  @java.lang.Override
+  public com.lansweeper.dp.outbound.v1.MappedValueOrBuilder getTypeOrBuilder() {
+    return type_ == null ? com.lansweeper.dp.outbound.v1.MappedValue.getDefaultInstance() : type_;
   }
 
   public static final int EMAIL_FIELD_NUMBER = 8;
@@ -545,9 +552,6 @@ private static final long serialVersionUID = 0L;
     if (((bitField0_ & 0x00000020) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 6, comment_);
     }
-    if (((bitField0_ & 0x00000040) != 0)) {
-      output.writeInt32(7, groupType_);
-    }
     if (((bitField0_ & 0x00000080) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 8, email_);
     }
@@ -560,6 +564,9 @@ private static final long serialVersionUID = 0L;
     for (int i = 0; i < memberOfOid_.size(); i++) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 11, memberOfOid_.getRaw(i));
     }
+    if (((bitField0_ & 0x00000040) != 0)) {
+      output.writeMessage(12, getType());
+    }
     getUnknownFields().writeTo(output);
   }
 
@@ -588,10 +595,6 @@ private static final long serialVersionUID = 0L;
     if (((bitField0_ & 0x00000020) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, comment_);
     }
-    if (((bitField0_ & 0x00000040) != 0)) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeInt32Size(7, groupType_);
-    }
     if (((bitField0_ & 0x00000080) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, email_);
     }
@@ -609,6 +612,10 @@ private static final long serialVersionUID = 0L;
       size += dataSize;
       size += 1 * getMemberOfOidList().size();
     }
+    if (((bitField0_ & 0x00000040) != 0)) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(12, getType());
+    }
     size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
@@ -654,10 +661,10 @@ private static final long serialVersionUID = 0L;
       if (!getComment()
           .equals(other.getComment())) return false;
     }
-    if (hasGroupType() != other.hasGroupType()) return false;
-    if (hasGroupType()) {
-      if (getGroupType()
-          != other.getGroupType()) return false;
+    if (hasType() != other.hasType()) return false;
+    if (hasType()) {
+      if (!getType()
+          .equals(other.getType())) return false;
     }
     if (hasEmail() != other.hasEmail()) return false;
     if (hasEmail()) {
@@ -711,9 +718,9 @@ private static final long serialVersionUID = 0L;
       hash = (37 * hash) + COMMENT_FIELD_NUMBER;
       hash = (53 * hash) + getComment().hashCode();
     }
-    if (hasGroupType()) {
-      hash = (37 * hash) + GROUP_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + getGroupType();
+    if (hasType()) {
+      hash = (37 * hash) + TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + getType().hashCode();
     }
     if (hasEmail()) {
       hash = (37 * hash) + EMAIL_FIELD_NUMBER;
@@ -867,6 +874,7 @@ private static final long serialVersionUID = 0L;
       if (com.google.protobuf.GeneratedMessageV3
               .alwaysUseFieldBuilders) {
         getAdObjectFieldBuilder();
+        getTypeFieldBuilder();
       }
     }
     @java.lang.Override
@@ -883,7 +891,11 @@ private static final long serialVersionUID = 0L;
       ou_ = "";
       description_ = "";
       comment_ = "";
-      groupType_ = 0;
+      type_ = null;
+      if (typeBuilder_ != null) {
+        typeBuilder_.dispose();
+        typeBuilder_ = null;
+      }
       email_ = "";
       managedByUserOid_ = "";
       managedByGroupOid_ = "";
@@ -950,7 +962,9 @@ private static final long serialVersionUID = 0L;
         to_bitField0_ |= 0x00000020;
       }
       if (((from_bitField0_ & 0x00000040) != 0)) {
-        result.groupType_ = groupType_;
+        result.type_ = typeBuilder_ == null
+            ? type_
+            : typeBuilder_.build();
         to_bitField0_ |= 0x00000040;
       }
       if (((from_bitField0_ & 0x00000080) != 0)) {
@@ -1044,8 +1058,8 @@ private static final long serialVersionUID = 0L;
         bitField0_ |= 0x00000020;
         onChanged();
       }
-      if (other.hasGroupType()) {
-        setGroupType(other.getGroupType());
+      if (other.hasType()) {
+        mergeType(other.getType());
       }
       if (other.hasEmail()) {
         email_ = other.email_;
@@ -1130,11 +1144,6 @@ private static final long serialVersionUID = 0L;
               bitField0_ |= 0x00000020;
               break;
             } // case 50
-            case 56: {
-              groupType_ = input.readInt32();
-              bitField0_ |= 0x00000040;
-              break;
-            } // case 56
             case 66: {
               email_ = input.readStringRequireUtf8();
               bitField0_ |= 0x00000080;
@@ -1156,6 +1165,13 @@ private static final long serialVersionUID = 0L;
               memberOfOid_.add(s);
               break;
             } // case 90
+            case 98: {
+              input.readMessage(
+                  getTypeFieldBuilder().getBuilder(),
+                  extensionRegistry);
+              bitField0_ |= 0x00000040;
+              break;
+            } // case 98
             default: {
               if (!super.parseUnknownField(input, extensionRegistry, tag)) {
                 done = true; // was an endgroup tag
@@ -1689,45 +1705,126 @@ private static final long serialVersionUID = 0L;
       return this;
     }
 
-    private int groupType_ ;
+    private com.lansweeper.dp.outbound.v1.MappedValue type_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.lansweeper.dp.outbound.v1.MappedValue, com.lansweeper.dp.outbound.v1.MappedValue.Builder, com.lansweeper.dp.outbound.v1.MappedValueOrBuilder> typeBuilder_;
     /**
-     * <code>optional int32 group_type = 7;</code>
-     * @return Whether the groupType field is set.
+     * <code>optional .com.lansweeper.dp.outbound.v1.MappedValue type = 12;</code>
+     * @return Whether the type field is set.
      */
-    @java.lang.Override
-    public boolean hasGroupType() {
+    public boolean hasType() {
       return ((bitField0_ & 0x00000040) != 0);
     }
     /**
-     * <code>optional int32 group_type = 7;</code>
-     * @return The groupType.
+     * <code>optional .com.lansweeper.dp.outbound.v1.MappedValue type = 12;</code>
+     * @return The type.
      */
-    @java.lang.Override
-    public int getGroupType() {
-      return groupType_;
+    public com.lansweeper.dp.outbound.v1.MappedValue getType() {
+      if (typeBuilder_ == null) {
+        return type_ == null ? com.lansweeper.dp.outbound.v1.MappedValue.getDefaultInstance() : type_;
+      } else {
+        return typeBuilder_.getMessage();
+      }
     }
     /**
-     * <code>optional int32 group_type = 7;</code>
-     * @param value The groupType to set.
-     * @return This builder for chaining.
+     * <code>optional .com.lansweeper.dp.outbound.v1.MappedValue type = 12;</code>
      */
-    public Builder setGroupType(int value) {
-
-      groupType_ = value;
+    public Builder setType(com.lansweeper.dp.outbound.v1.MappedValue value) {
+      if (typeBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        type_ = value;
+      } else {
+        typeBuilder_.setMessage(value);
+      }
       bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
     /**
-     * <code>optional int32 group_type = 7;</code>
-     * @return This builder for chaining.
+     * <code>optional .com.lansweeper.dp.outbound.v1.MappedValue type = 12;</code>
+     */
+    public Builder setType(
+        com.lansweeper.dp.outbound.v1.MappedValue.Builder builderForValue) {
+      if (typeBuilder_ == null) {
+        type_ = builderForValue.build();
+      } else {
+        typeBuilder_.setMessage(builderForValue.build());
+      }
+      bitField0_ |= 0x00000040;
+      onChanged();
+      return this;
+    }
+    /**
+     * <code>optional .com.lansweeper.dp.outbound.v1.MappedValue type = 12;</code>
+     */
+    public Builder mergeType(com.lansweeper.dp.outbound.v1.MappedValue value) {
+      if (typeBuilder_ == null) {
+        if (((bitField0_ & 0x00000040) != 0) &&
+          type_ != null &&
+          type_ != com.lansweeper.dp.outbound.v1.MappedValue.getDefaultInstance()) {
+          getTypeBuilder().mergeFrom(value);
+        } else {
+          type_ = value;
+        }
+      } else {
+        typeBuilder_.mergeFrom(value);
+      }
+      if (type_ != null) {
+        bitField0_ |= 0x00000040;
+        onChanged();
+      }
+      return this;
+    }
+    /**
+     * <code>optional .com.lansweeper.dp.outbound.v1.MappedValue type = 12;</code>
      */
-    public Builder clearGroupType() {
+    public Builder clearType() {
       bitField0_ = (bitField0_ & ~0x00000040);
-      groupType_ = 0;
+      type_ = null;
+      if (typeBuilder_ != null) {
+        typeBuilder_.dispose();
+        typeBuilder_ = null;
+      }
       onChanged();
       return this;
     }
+    /**
+     * <code>optional .com.lansweeper.dp.outbound.v1.MappedValue type = 12;</code>
+     */
+    public com.lansweeper.dp.outbound.v1.MappedValue.Builder getTypeBuilder() {
+      bitField0_ |= 0x00000040;
+      onChanged();
+      return getTypeFieldBuilder().getBuilder();
+    }
+    /**
+     * <code>optional .com.lansweeper.dp.outbound.v1.MappedValue type = 12;</code>
+     */
+    public com.lansweeper.dp.outbound.v1.MappedValueOrBuilder getTypeOrBuilder() {
+      if (typeBuilder_ != null) {
+        return typeBuilder_.getMessageOrBuilder();
+      } else {
+        return type_ == null ?
+            com.lansweeper.dp.outbound.v1.MappedValue.getDefaultInstance() : type_;
+      }
+    }
+    /**
+     * <code>optional .com.lansweeper.dp.outbound.v1.MappedValue type = 12;</code>
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.lansweeper.dp.outbound.v1.MappedValue, com.lansweeper.dp.outbound.v1.MappedValue.Builder, com.lansweeper.dp.outbound.v1.MappedValueOrBuilder> 
+        getTypeFieldBuilder() {
+      if (typeBuilder_ == null) {
+        typeBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.lansweeper.dp.outbound.v1.MappedValue, com.lansweeper.dp.outbound.v1.MappedValue.Builder, com.lansweeper.dp.outbound.v1.MappedValueOrBuilder>(
+                getType(),
+                getParentForChildren(),
+                isClean());
+        type_ = null;
+      }
+      return typeBuilder_;
+    }
 
     private java.lang.Object email_ = "";
     /**

package/model/target/generated-sources/protobuf/java/com/lansweeper/dp/outbound/v1/ActiveDirectoryGroupOrBuilder.java

@@ -109,15 +109,19 @@ public interface ActiveDirectoryGroupOrBuilder extends
       getCommentBytes();
 
   /**
-   * <code>optional int32 group_type = 7;</code>
-   * @return Whether the groupType field is set.
+   * <code>optional .com.lansweeper.dp.outbound.v1.MappedValue type = 12;</code>
+   * @return Whether the type field is set.
    */
-  boolean hasGroupType();
+  boolean hasType();
   /**
-   * <code>optional int32 group_type = 7;</code>
-   * @return The groupType.
+   * <code>optional .com.lansweeper.dp.outbound.v1.MappedValue type = 12;</code>
+   * @return The type.
    */
-  int getGroupType();
+  com.lansweeper.dp.outbound.v1.MappedValue getType();
+  /**
+   * <code>optional .com.lansweeper.dp.outbound.v1.MappedValue type = 12;</code>
+   */
+  com.lansweeper.dp.outbound.v1.MappedValueOrBuilder getTypeOrBuilder();
 
   /**
    * <code>optional string email = 8;</code>