Fixed issues with labels on branches (branches do not have labels).

Author: EricWittmann

app/src/main/java/io/apicurio/registry/rest/v3/V3ApiUtil.java

@@ -181,7 +181,6 @@ public static BranchSearchResults dtoToSearchResults(BranchSearchResultsDto dto)
             searchedBranch.setBranchId(branch.getBranchId());
             searchedBranch.setModifiedBy(branch.getModifiedBy());
             searchedBranch.setModifiedOn(new Date(branch.getModifiedOn()));
-            searchedBranch.setLabels(branch.getLabels());
             results.getBranches().add(searchedBranch);
         });
         return results;

app/src/main/java/io/apicurio/registry/storage/dto/SearchedBranchDto.java

@@ -8,8 +8,6 @@
 import lombok.Setter;
 import lombok.ToString;
 
-import java.util.Map;
-
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
@@ -28,6 +26,5 @@ public class SearchedBranchDto {
     private long createdOn;
     private String modifiedBy;
     private long modifiedOn;
-    private Map<String, String> labels;
 
 }

app/src/main/java/io/apicurio/registry/storage/impl/sql/AbstractSqlRegistryStorage.java

@@ -3450,7 +3450,6 @@ public BranchSearchResultsDto getBranches(GA ga, int offset, int limit) {
 
             // Execute query
             List<SearchedBranchDto> branches = branchesQuery.map(SearchedBranchMapper.instance).list();
-            limitReturnedLabelsInBranches(branches);
             // Execute count query
             Integer count = countQuery.mapTo(Integer.class).one();
 
@@ -3813,7 +3812,7 @@ private Map<String, String> limitReturnedLabels(Map<String, String> labels) {
                 if (totalBytes < maxBytes) {
                     String value = labels.get(key);
                     cappedLabels.put(key, value);
-                    totalBytes += value.length() + key.length();
+                    totalBytes += key.length() + (value != null ? value.length() : 0);
                 }
             }
             return cappedLabels;
@@ -3846,12 +3845,4 @@ private void limitReturnedLabelsInVersions(List<SearchedVersionDto> versions) {
         });
     }
 
-    private void limitReturnedLabelsInBranches(List<SearchedBranchDto> branches) {
-        branches.forEach(branch -> {
-            Map<String, String> labels = branch.getLabels();
-            Map<String, String> cappedLabels = limitReturnedLabels(labels);
-            branch.setLabels(cappedLabels);
-        });
-    }
-
 }

app/src/main/java/io/apicurio/registry/storage/impl/sql/mappers/SearchedBranchMapper.java

@@ -28,6 +28,6 @@ public SearchedBranchDto map(ResultSet rs) throws SQLException {
                 .description(rs.getString("description")).systemDefined(rs.getBoolean("systemDefined"))
                 .owner(rs.getString("owner")).createdOn(rs.getTimestamp("createdOn").getTime())
                 .modifiedBy(rs.getString("modifiedBy")).modifiedOn(rs.getTimestamp("modifiedOn").getTime())
-                .labels(RegistryContentUtils.deserializeLabels(rs.getString("labels"))).build();
+                .build();
     }
 }

common/src/main/resources/META-INF/openapi.json

@@ -5218,10 +5218,6 @@
           "systemDefined": {
             "description": "",
             "type": "boolean"
-          },
-          "labels": {
-            "$ref": "#/components/schemas/Labels",
-            "description": ""
           }
         },
         "example": {

docs/modules/ROOT/partials/getting-started/ref-registry-all-configs.adoc

@@ -557,6 +557,11 @@ The following {registry} configuration options are available for each component
 |`false`
 |`3.0.2`
 |Enables artifact version mutability
+|`apicurio.rest.search-results.labels.max-size.bytes`
+|`int`
+|`512`
+|`3.0.3`
+|Max size of the labels (in bytes) per item from within search results
 |===
 
 == semver

go-sdk/pkg/registryclient-v3/kiota-lock.json

@@ -1,5 +1,5 @@
 {
-  "descriptionHash": "00581DCACB1B1D7CFE571A59235CDC2AE7CA2C5158E25D26D03F23337D82CC23EFFD219AFAF562BB50AA94EFB196FFED7150C31C23BBB22910B7AD366AC7FF2D",
+  "descriptionHash": "D346A2A9A40F1B86E55F338BFB56645B0AE0D95EF3B3E66B14920108B20F119845B8EF22305D5C70D8DFDCC4BA0E39B5A78BD1F19D81AB90587F206B2470163D",
   "descriptionLocation": "../../v3.json",
   "lockFileVersion": "1.0.0",
   "kiotaVersion": "1.19.1",

go-sdk/pkg/registryclient-v3/models/searched_branch.go

@@ -18,8 +18,6 @@ type SearchedBranch struct {
 	description *string
 	// An ID of a single artifact group.
 	groupId *string
-	// User-defined name-value pairs. Name and value must be strings.
-	labels Labelsable
 	// The modifiedBy property
 	modifiedBy *string
 	// The modifiedOn property
@@ -127,16 +125,6 @@ func (m *SearchedBranch) GetFieldDeserializers() map[string]func(i878a80d2330e89
 		}
 		return nil
 	}
-	res["labels"] = func(n i878a80d2330e89d26896388a3f487eef27b0a0e6c010c493bf80be1452208f91.ParseNode) error {
-		val, err := n.GetObjectValue(CreateLabelsFromDiscriminatorValue)
-		if err != nil {
-			return err
-		}
-		if val != nil {
-			m.SetLabels(val.(Labelsable))
-		}
-		return nil
-	}
 	res["modifiedBy"] = func(n i878a80d2330e89d26896388a3f487eef27b0a0e6c010c493bf80be1452208f91.ParseNode) error {
 		val, err := n.GetStringValue()
 		if err != nil {
@@ -186,12 +174,6 @@ func (m *SearchedBranch) GetGroupId() *string {
 	return m.groupId
 }
 
-// GetLabels gets the labels property value. User-defined name-value pairs. Name and value must be strings.
-// returns a Labelsable when successful
-func (m *SearchedBranch) GetLabels() Labelsable {
-	return m.labels
-}
-
 // GetModifiedBy gets the modifiedBy property value. The modifiedBy property
 // returns a *string when successful
 func (m *SearchedBranch) GetModifiedBy() *string {
@@ -248,12 +230,6 @@ func (m *SearchedBranch) Serialize(writer i878a80d2330e89d26896388a3f487eef27b0a
 			return err
 		}
 	}
-	{
-		err := writer.WriteObjectValue("labels", m.GetLabels())
-		if err != nil {
-			return err
-		}
-	}
 	{
 		err := writer.WriteStringValue("modifiedBy", m.GetModifiedBy())
 		if err != nil {
@@ -317,11 +293,6 @@ func (m *SearchedBranch) SetGroupId(value *string) {
 	m.groupId = value
 }
 
-// SetLabels sets the labels property value. User-defined name-value pairs. Name and value must be strings.
-func (m *SearchedBranch) SetLabels(value Labelsable) {
-	m.labels = value
-}
-
 // SetModifiedBy sets the modifiedBy property value. The modifiedBy property
 func (m *SearchedBranch) SetModifiedBy(value *string) {
 	m.modifiedBy = value
@@ -350,7 +321,6 @@ type SearchedBranchable interface {
 	GetCreatedOn() *i336074805fc853987abe6f7fe3ad97a6a6f3077a16391fec744f671a015fbd7e.Time
 	GetDescription() *string
 	GetGroupId() *string
-	GetLabels() Labelsable
 	GetModifiedBy() *string
 	GetModifiedOn() *i336074805fc853987abe6f7fe3ad97a6a6f3077a16391fec744f671a015fbd7e.Time
 	GetOwner() *string
@@ -360,7 +330,6 @@ type SearchedBranchable interface {
 	SetCreatedOn(value *i336074805fc853987abe6f7fe3ad97a6a6f3077a16391fec744f671a015fbd7e.Time)
 	SetDescription(value *string)
 	SetGroupId(value *string)
-	SetLabels(value Labelsable)
 	SetModifiedBy(value *string)
 	SetModifiedOn(value *i336074805fc853987abe6f7fe3ad97a6a6f3077a16391fec744f671a015fbd7e.Time)
 	SetOwner(value *string)