Fixed issue where the custom defined aspects were missing from the AP…

…I specification. Modified entity registry to include custom aspects during applying the patch.

build.gradle

@@ -247,6 +247,7 @@ project.ext.externalDependency = [
     'springActuator': "org.springframework.boot:spring-boot-starter-actuator:$springBootVersion",
     'swaggerAnnotations': 'io.swagger.core.v3:swagger-annotations:2.2.15',
     'swaggerCli': 'io.swagger.codegen.v3:swagger-codegen-cli:3.0.46',
+    'swaggerCore': 'io.swagger.core.v3:swagger-core:2.2.7',
     'springBootAutoconfigureJdk11': 'org.springframework.boot:spring-boot-autoconfigure:2.7.18',
     'testng': 'org.testng:testng:7.8.0',
     'testContainers': 'org.testcontainers:testcontainers:' + testContainersVersion,

entity-registry/build.gradle

@@ -35,5 +35,11 @@ dependencies {
   testAnnotationProcessor externalDependency.lombok
   testImplementation externalDependency.classGraph
 
+  testImplementation externalDependency.swaggerCore
+  testImplementation spec.product.pegasus.dataAvro
+  testImplementation('io.acryl:json-schema-avro:0.2.2') {
+    exclude group: 'com.fasterxml.jackson.core', module: 'jackson-databind'
+  }
+
 }
 compileTestJava.dependsOn tasks.getByPath(':entity-registry:custom-test-model:modelDeploy')

entity-registry/src/main/java/com/linkedin/metadata/models/registry/MergedEntityRegistry.java

@@ -73,6 +73,13 @@ public MergedEntityRegistry apply(EntityRegistry patchEntityRegistry)
               validationResult.validationFailures.stream().collect(Collectors.joining("\n"))));
     }
 
+    // Merge Aspect Specs
+    // (Fixed issue where custom defined aspects are not included in the API specification.)
+    //
+    if (!patchEntityRegistry.getAspectSpecs().isEmpty()) {
+      _aspectNameToSpec.putAll(patchEntityRegistry.getAspectSpecs());
+    }
+
     // Merge Entity Specs
     for (Map.Entry<String, EntitySpec> e2Entry : patchEntityRegistry.getEntitySpecs().entrySet()) {
       if (entityNameToSpec.containsKey(e2Entry.getKey())) {