61949: replacing object factories with decorator

src/app/+workflowitems-edit-page/workflowitems-edit-page-routing.module.ts

@@ -20,4 +20,4 @@ import { SubmissionEditComponent } from '../submission/edit/submission-edit.comp
 /**
  * This module defines the default component to load when navigating to the workflowitems edit page path.
  */
-export class WorkflowitemsEditPageRoutingModule { }
+export class WorkflowItemsEditPageRoutingModule { }

src/app/+workflowitems-edit-page/workflowitems-edit-page.module.ts

@@ -1,12 +1,12 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { SharedModule } from '../shared/shared.module';
-import { WorkflowitemsEditPageRoutingModule } from './workflowitems-edit-page-routing.module';
+import { WorkflowItemsEditPageRoutingModule } from './workflowitems-edit-page-routing.module';
 import { SubmissionModule } from '../submission/submission.module';
 
 @NgModule({
   imports: [
-    WorkflowitemsEditPageRoutingModule,
+    WorkflowItemsEditPageRoutingModule,
     CommonModule,
     SharedModule,
     SubmissionModule,
@@ -16,6 +16,6 @@ import { SubmissionModule } from '../submission/submission.module';
 /**
  * This module handles all modules that need to access the workflowitems edit page.
  */
-export class WorkflowitemsEditPageModule {
+export class WorkflowItemsEditPageModule {
 
 }

src/app/app-routing.module.ts

@@ -31,7 +31,7 @@ export function getCommunityModulePath() {
       { path: 'logout', loadChildren: './+logout-page/logout-page.module#LogoutPageModule' },
       { path: 'submit', loadChildren: './+submit-page/submit-page.module#SubmitPageModule' },
       { path: 'workspaceitems', loadChildren: './+workspaceitems-edit-page/workspaceitems-edit-page.module#WorkspaceitemsEditPageModule' },
-      { path: 'workflowitems', loadChildren: './+workflowitems-edit-page/workflowitems-edit-page.module#WorkflowitemsEditPageModule' },
+      { path: 'workflowitems', loadChildren: './+workflowitems-edit-page/workflowitems-edit-page.module#WorkflowItemsEditPageModule' },
       { path: '**', pathMatch: 'full', component: PageNotFoundComponent },
     ])
   ],

src/app/core/auth/auth-type.ts

@@ -1,5 +0,0 @@
-export enum AuthType {
-  EPerson = 'eperson',
-  Status = 'status',
-  Group = 'group'
-}

src/app/core/auth/models/normalized-auth-status.model.ts

@@ -4,9 +4,11 @@ import { mapsTo, relationship } from '../../cache/builders/build-decorators';
 import { ResourceType } from '../../shared/resource-type';
 import { NormalizedObject } from '../../cache/models/normalized-object.model';
 import { IDToUUIDSerializer } from '../../cache/id-to-uuid-serializer';
+import { resourceType } from '../../shared/resource-type.decorator';
 
 @mapsTo(AuthStatus)
 @inheritSerialization(NormalizedObject)
+@resourceType(ResourceType.AuthStatus)
 export class NormalizedAuthStatus extends NormalizedObject<AuthStatus> {
   @autoserialize
   id: string;

src/app/core/cache/models/normalized-bitstream-format.model.ts

@@ -5,12 +5,15 @@ import { mapsTo } from '../builders/build-decorators';
 import { IDToUUIDSerializer } from '../id-to-uuid-serializer';
 import { NormalizedObject } from './normalized-object.model';
 import { SupportLevel } from './support-level.model';
+import { resourceType } from '../../shared/resource-type.decorator';
+import { ResourceType } from '../../shared/resource-type';
 
 /**
  * Normalized model class for a Bitstream Format
  */
 @mapsTo(BitstreamFormat)
 @inheritSerialization(NormalizedObject)
+@resourceType(ResourceType.BitstreamFormat)
 export class NormalizedBitstreamFormat extends NormalizedObject<BitstreamFormat> {
 
   /**

src/app/core/cache/models/normalized-bitstream.model.ts

@@ -4,12 +4,14 @@ import { NormalizedDSpaceObject } from './normalized-dspace-object.model';
 import { Bitstream } from '../../shared/bitstream.model';
 import { mapsTo, relationship } from '../builders/build-decorators';
 import { ResourceType } from '../../shared/resource-type';
+import { resourceType } from '../../shared/resource-type.decorator';
 
 /**
  * Normalized model class for a DSpace Bitstream
  */
 @mapsTo(Bitstream)
 @inheritSerialization(NormalizedDSpaceObject)
+@resourceType(ResourceType.Bitstream)
 export class NormalizedBitstream extends NormalizedDSpaceObject<Bitstream> {
 
   /**

src/app/core/cache/models/normalized-bundle.model.ts

@@ -4,12 +4,14 @@ import { NormalizedDSpaceObject } from './normalized-dspace-object.model';
 import { Bundle } from '../../shared/bundle.model';
 import { mapsTo, relationship } from '../builders/build-decorators';
 import { ResourceType } from '../../shared/resource-type';
+import { resourceType } from '../../shared/resource-type.decorator';
 
 /**
  * Normalized model class for a DSpace Bundle
  */
 @mapsTo(Bundle)
 @inheritSerialization(NormalizedDSpaceObject)
+@resourceType(ResourceType.Bundle)
 export class NormalizedBundle extends NormalizedDSpaceObject<Bundle> {
   /**
    * The primary bitstream of this Bundle

src/app/core/cache/models/normalized-collection.model.ts

@@ -4,12 +4,14 @@ import { NormalizedDSpaceObject } from './normalized-dspace-object.model';
 import { Collection } from '../../shared/collection.model';
 import { mapsTo, relationship } from '../builders/build-decorators';
 import { ResourceType } from '../../shared/resource-type';
+import { resourceType } from '../../shared/resource-type.decorator';
 
 /**
  * Normalized model class for a DSpace Collection
  */
 @mapsTo(Collection)
 @inheritSerialization(NormalizedDSpaceObject)
+@resourceType(ResourceType.Collection)
 export class NormalizedCollection extends NormalizedDSpaceObject<Collection> {
 
   /**

src/app/core/cache/models/normalized-community.model.ts

@@ -4,12 +4,14 @@ import { NormalizedDSpaceObject } from './normalized-dspace-object.model';
 import { Community } from '../../shared/community.model';
 import { mapsTo, relationship } from '../builders/build-decorators';
 import { ResourceType } from '../../shared/resource-type';
+import { resourceType } from '../../shared/resource-type.decorator';
 
 /**
  * Normalized model class for a DSpace Community
  */
 @mapsTo(Community)
 @inheritSerialization(NormalizedDSpaceObject)
+@resourceType(ResourceType.Community)
 export class NormalizedCommunity extends NormalizedDSpaceObject<Community> {
 
   /**

src/app/core/cache/models/normalized-dspace-object.model.ts

@@ -4,11 +4,13 @@ import { MetadataMap, MetadataMapSerializer } from '../../shared/metadata.models
 import { ResourceType } from '../../shared/resource-type';
 import { mapsTo } from '../builders/build-decorators';
 import { NormalizedObject } from './normalized-object.model';
+import { resourceType } from '../../shared/resource-type.decorator';
 
 /**
  * An model class for a DSpaceObject.
  */
 @mapsTo(DSpaceObject)
+@resourceType(ResourceType.DSpaceObject)
 export class NormalizedDSpaceObject<T extends DSpaceObject> extends NormalizedObject<T> {
 
   /**

src/app/core/cache/models/normalized-item.model.ts

@@ -4,12 +4,14 @@ import { NormalizedDSpaceObject } from './normalized-dspace-object.model';
 import { Item } from '../../shared/item.model';
 import { mapsTo, relationship } from '../builders/build-decorators';
 import { ResourceType } from '../../shared/resource-type';
+import { resourceType } from '../../shared/resource-type.decorator';
 
 /**
  * Normalized model class for a DSpace Item
  */
 @mapsTo(Item)
 @inheritSerialization(NormalizedDSpaceObject)
+@resourceType(ResourceType.Item)
 export class NormalizedItem extends NormalizedDSpaceObject<Item> {
 
   /**

src/app/core/cache/models/normalized-license.model.ts

@@ -2,12 +2,15 @@ import { autoserialize, inheritSerialization } from 'cerialize';
 import { mapsTo } from '../builders/build-decorators';
 import { NormalizedDSpaceObject } from './normalized-dspace-object.model';
 import { License } from '../../shared/license.model';
+import { resourceType } from '../../shared/resource-type.decorator';
+import { ResourceType } from '../../shared/resource-type';
 
 /**
  * Normalized model class for a Collection License
  */
 @mapsTo(License)
 @inheritSerialization(NormalizedDSpaceObject)
+@resourceType(ResourceType.License)
 export class NormalizedLicense extends NormalizedDSpaceObject<License> {
 
   /**

src/app/core/cache/models/normalized-object-factory.ts

@@ -59,10 +59,10 @@ export class NormalizedObjectFactory {
       case ResourceType.MetadataField: {
         return NormalizedGroup
       }
-      case ResourceType.Workspaceitem: {
+      case ResourceType.WorkspaceItem: {
         return NormalizedWorkspaceItem
       }
-      case ResourceType.Workflowitem: {
+      case ResourceType.WorkflowItem: {
         return NormalizedWorkflowItem
       }
       case ResourceType.SubmissionDefinition:

src/app/core/cache/models/normalized-resource-policy.model.ts

@@ -5,12 +5,15 @@ import { mapsTo } from '../builders/build-decorators';
 import { NormalizedObject } from './normalized-object.model';
 import { IDToUUIDSerializer } from '../id-to-uuid-serializer';
 import { ActionType } from './action-type.model';
+import { resourceType } from '../../shared/resource-type.decorator';
+import { ResourceType } from '../../shared/resource-type';
 
 /**
  * Normalized model class for a Resource Policy
  */
 @mapsTo(ResourcePolicy)
 @inheritSerialization(NormalizedObject)
+@resourceType(ResourceType.ResourcePolicy)
 export class NormalizedResourcePolicy extends NormalizedObject<ResourcePolicy> {
 
   /**

src/app/core/config/models/normalized-config-submission-definitions.model.ts

@@ -3,11 +3,16 @@ import { SubmissionSectionModel } from './config-submission-section.model';
 import { PaginatedList } from '../../data/paginated-list';
 import { NormalizedConfigObject } from './normalized-config.model';
 import { SubmissionDefinitionsModel } from './config-submission-definitions.model';
+import { resourceType } from '../../shared/resource-type.decorator';
+import { ResourceType } from '../../shared/resource-type';
+import { mapsTo } from '../../cache/builders/build-decorators';
 
 /**
  * Normalized class for the configuration describing the submission
  */
+@mapsTo(SubmissionDefinitionsModel)
 @inheritSerialization(NormalizedConfigObject)
+@resourceType(ResourceType.SubmissionDefinitions)
 export class NormalizedSubmissionDefinitionsModel extends NormalizedConfigObject<SubmissionDefinitionsModel> {
 
   /**

src/app/core/core.module.ts

@@ -64,7 +64,7 @@ import { RegistryService } from './registry/registry.service';
 import { RegistryMetadataschemasResponseParsingService } from './data/registry-metadataschemas-response-parsing.service';
 import { RegistryMetadatafieldsResponseParsingService } from './data/registry-metadatafields-response-parsing.service';
 import { RegistryBitstreamformatsResponseParsingService } from './data/registry-bitstreamformats-response-parsing.service';
-import { WorkflowitemDataService } from './submission/workflowitem-data.service';
+import { WorkflowItemDataService } from './submission/workflowitem-data.service';
 import { NotificationsService } from '../shared/notifications/notifications.service';
 import { UploaderService } from '../shared/uploader/uploader.service';
 import { FileService } from './shared/file.service';
@@ -152,7 +152,7 @@ const PROVIDERS = [
   UUIDService,
   NotificationsService,
   WorkspaceitemDataService,
-  WorkflowitemDataService,
+  WorkflowItemDataService,
   UploaderService,
   FileService,
   DSpaceObjectDataService,

src/app/core/eperson/models/normalized-eperson.model.ts

@@ -6,9 +6,11 @@ import { NormalizedDSpaceObject } from '../../cache/models/normalized-dspace-obj
 import { EPerson } from './eperson.model';
 import { mapsTo, relationship } from '../../cache/builders/build-decorators';
 import { ResourceType } from '../../shared/resource-type';
+import { resourceType } from '../../shared/resource-type.decorator';
 
 @mapsTo(EPerson)
 @inheritSerialization(NormalizedDSpaceObject)
+@resourceType(ResourceType.EPerson)
 export class NormalizedEPerson extends NormalizedDSpaceObject<EPerson> implements CacheableObject, ListableObject {
 
   /**

src/app/core/eperson/models/normalized-group.model.ts

@@ -6,9 +6,11 @@ import { NormalizedDSpaceObject } from '../../cache/models/normalized-dspace-obj
 import { mapsTo, relationship } from '../../cache/builders/build-decorators';
 import { Group } from './group.model';
 import { ResourceType } from '../../shared/resource-type';
+import { resourceType } from '../../shared/resource-type.decorator';
 
 @mapsTo(Group)
 @inheritSerialization(NormalizedDSpaceObject)
+@resourceType(ResourceType.Group)
 export class NormalizedGroup extends NormalizedDSpaceObject<Group> implements CacheableObject, ListableObject {
 
   /**

src/app/core/metadata/metadata-field.model.ts

@@ -1,25 +1,18 @@
-import { MetadataSchema } from './metadataschema.model';
-import { autoserialize } from 'cerialize';
 import { ListableObject } from '../../shared/object-collection/shared/listable-object.model';
 import { isNotEmpty } from '../../shared/empty.util';
+import { MetadataSchema } from './metadata-schema.model';
 
 export class MetadataField implements ListableObject {
-  @autoserialize
   id: number;
 
-  @autoserialize
   self: string;
 
-  @autoserialize
   element: string;
 
-  @autoserialize
   qualifier: string;
 
-  @autoserialize
   scopeNote: string;
 
-  @autoserialize
   schema: MetadataSchema;
 
   toString(separator: string = '.'): string {

src/app/core/metadata/metadata-schema.model.ts

@@ -1,16 +1,11 @@
-import { autoserialize } from 'cerialize';
 import { ListableObject } from '../../shared/object-collection/shared/listable-object.model';
 
 export class MetadataSchema implements ListableObject {
-  @autoserialize
   id: number;
 
-  @autoserialize
   self: string;
 
-  @autoserialize
   prefix: string;
 
-  @autoserialize
   namespace: string;
 }

src/app/core/metadata/normalized-metadata-field.model.ts

@@ -0,0 +1,30 @@
+import { autoserialize, deserialize } from 'cerialize';
+import { mapsTo, relationship } from '../cache/builders/build-decorators';
+import { ResourceType } from '../shared/resource-type';
+import { resourceType } from '../shared/resource-type.decorator';
+import { MetadataField } from './metadata-field.model';
+import { NormalizedObject } from '../cache/models/normalized-object.model';
+import { ListableObject } from '../../shared/object-collection/shared/listable-object.model';
+
+@mapsTo(MetadataField)
+@resourceType(ResourceType.MetadataField)
+export class NormalizedMetadataField extends NormalizedObject<MetadataField> implements ListableObject {
+  @autoserialize
+  id: number;
+
+  @autoserialize
+  self: string;
+
+  @autoserialize
+  element: string;
+
+  @autoserialize
+  qualifier: string;
+
+  @autoserialize
+  scopeNote: string;
+
+  @deserialize
+  @relationship(ResourceType.MetadataSchema)
+  schema: string;
+}

src/app/core/metadata/normalized-metadata-schema.model.ts

@@ -2,12 +2,15 @@ import { autoserialize } from 'cerialize';
 import { NormalizedObject } from '../cache/models/normalized-object.model';
 import { mapsTo } from '../cache/builders/build-decorators';
 import { ListableObject } from '../../shared/object-collection/shared/listable-object.model';
-import { MetadataSchema } from './metadataschema.model';
+import { resourceType } from '../shared/resource-type.decorator';
+import { ResourceType } from '../shared/resource-type';
+import { MetadataSchema } from './metadata-schema.model';
 
 /**
  * Normalized class for a DSpace MetadataSchema
  */
 @mapsTo(MetadataSchema)
+@resourceType(ResourceType.MetadataSchema)
 export class NormalizedMetadataSchema extends NormalizedObject<MetadataSchema> implements ListableObject {
   /**
    * The unique identifier for this schema

src/app/core/shared/resource-type.decorator.ts

@@ -0,0 +1,16 @@
+import { CacheableObject } from '../cache/object-cache.reducer';
+import { GenericConstructor } from './generic-constructor';
+
+const resourceTypeForObjectMap = new Map();
+export function resourceType(resourceType: string) {
+  return function decorator(objectConstructor: GenericConstructor<CacheableObject>) {
+    if (!objectConstructor) {
+      return;
+    }
+    resourceTypeForObjectMap.set(resourceType, objectConstructor);
+  };
+}
+
+export function rendersSectionType(resourceType: string) {
+  return resourceTypeForObjectMap.get(resourceType);
+}

src/app/core/shared/resource-type.ts

@@ -12,12 +12,13 @@ export enum ResourceType {
   MetadataSchema = 'metadataschema',
   MetadataField = 'metadatafield',
   License = 'license',
-  Workflowitem = 'workflowitem',
+  WorkflowItem = 'workflowitem',
-  Workspaceitem = 'workspaceitem',
+  WorkspaceItem = 'workspaceitem',
   SubmissionDefinitions = 'submissiondefinitions',
   SubmissionDefinition = 'submissiondefinition',
   SubmissionForm = 'submissionform',
   SubmissionForms = 'submissionforms',
   SubmissionSections = 'submissionsections',
   SubmissionSection = 'submissionsection',
+  AuthStatus = 'status'
 }

src/app/core/submission/models/normalized-workflowitem.model.ts

@@ -1,16 +1,18 @@
 import { autoserialize, inheritSerialization } from 'cerialize';
 
 import { mapsTo, relationship } from '../../cache/builders/build-decorators';
-import { Workflowitem } from './workflowitem.model';
+import { WorkflowItem } from './workflowitem.model';
 import { NormalizedSubmissionObject } from './normalized-submission-object.model';
 import { ResourceType } from '../../shared/resource-type';
+import { resourceType } from '../../shared/resource-type.decorator';
 
 /**
  * An model class for a NormalizedWorkflowItem.
  */
-@mapsTo(Workflowitem)
+@mapsTo(WorkflowItem)
 @inheritSerialization(NormalizedSubmissionObject)
-export class NormalizedWorkflowItem extends NormalizedSubmissionObject<Workflowitem> {
+@resourceType(ResourceType.WorkflowItem)
+export class NormalizedWorkflowItem extends NormalizedSubmissionObject<WorkflowItem> {
 
   /**
    * The collection this workflowitem belonging to

src/app/core/submission/models/normalized-workspaceitem.model.ts

@@ -1,19 +1,21 @@
 import { autoserialize, inheritSerialization } from 'cerialize';
 
-import { Workspaceitem } from './workspaceitem.model';
+import { WorkspaceItem } from './workspaceitem.model';
 import { NormalizedSubmissionObject } from './normalized-submission-object.model';
 import { mapsTo, relationship } from '../../cache/builders/build-decorators';
 import { NormalizedDSpaceObject } from '../../cache/models/normalized-dspace-object.model';
 import { ResourceType } from '../../shared/resource-type';
-import { Workflowitem } from './workflowitem.model';
+import { WorkflowItem } from './workflowitem.model';
+import { resourceType } from '../../shared/resource-type.decorator';
 
 /**
  * An model class for a NormalizedWorkspaceItem.
  */
-@mapsTo(Workspaceitem)
+@mapsTo(WorkspaceItem)
 @inheritSerialization(NormalizedDSpaceObject)
 @inheritSerialization(NormalizedSubmissionObject)
-export class NormalizedWorkspaceItem extends NormalizedSubmissionObject<Workflowitem> {
+@resourceType(ResourceType.WorkspaceItem)
+export class NormalizedWorkspaceItem extends NormalizedSubmissionObject<WorkflowItem> {
 
   /**
    * The collection this workspaceitem belonging to

src/app/core/submission/models/workflowitem.model.ts

@@ -1,7 +1,7 @@
-import { Workspaceitem } from './workspaceitem.model';
+import { WorkspaceItem } from './workspaceitem.model';
 
 /**
- * A model class for a Workflowitem.
+ * A model class for a WorkflowItem.
  */
-export class Workflowitem extends Workspaceitem {
+export class WorkflowItem extends WorkspaceItem {
 }

src/app/core/submission/models/workspaceitem.model.ts

@@ -1,8 +1,8 @@
 import { SubmissionObject } from './submission-object.model';
 
 /**
- * A model class for a Workspaceitem.
+ * A model class for a WorkspaceItem.
  */
-export class Workspaceitem extends SubmissionObject {
+export class WorkspaceItem extends SubmissionObject {
 
 }

src/app/core/submission/workflowitem-data.service.ts

@@ -6,7 +6,7 @@ import { RemoteDataBuildService } from '../cache/builders/remote-data-build.serv
 import { CoreState } from '../core.reducers';
 import { DataService } from '../data/data.service';
 import { RequestService } from '../data/request.service';
-import { Workflowitem } from './models/workflowitem.model';
+import { WorkflowItem } from './models/workflowitem.model';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { FindAllOptions } from '../data/request.models';
 import { NormalizedObjectBuildService } from '../cache/builders/normalized-object-build.service';
@@ -18,12 +18,12 @@ import { DSOChangeAnalyzer } from '../data/dso-change-analyzer.service';
  * A service that provides methods to make REST requests with workflowitems endpoint.
  */
 @Injectable()
-export class WorkflowitemDataService extends DataService<Workflowitem> {
+export class WorkflowItemDataService extends DataService<WorkflowItem> {
   protected linkPath = 'workflowitems';
   protected forceBypassCache = true;
 
   constructor(
-    protected comparator: DSOChangeAnalyzer<Workflowitem>,
+    protected comparator: DSOChangeAnalyzer<WorkflowItem>,
     protected dataBuildService: NormalizedObjectBuildService,
     protected halService: HALEndpointService,
     protected http: HttpClient,

src/app/submission/objects/submission-objects.effects.ts

@@ -30,9 +30,9 @@ import {
 } from './submission-objects.actions';
 import { SectionsService } from '../sections/sections.service';
 import { isEmpty, isNotEmpty, isNotUndefined } from '../../shared/empty.util';
-import { Workspaceitem } from '../../core/submission/models/workspaceitem.model';
+import { WorkspaceItem } from '../../core/submission/models/workspaceitem.model';
 import { SubmissionService } from '../submission.service';
-import { Workflowitem } from '../../core/submission/models/workflowitem.model';
+import { WorkflowItem } from '../../core/submission/models/workflowitem.model';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { SubmissionObject } from '../../core/submission/models/submission-object.model';
 import { TranslateService } from '@ngx-translate/core';
@@ -265,7 +265,7 @@ export class SubmissionObjectEffects {
     let canDeposit = true;
 
     if (isNotEmpty(response)) {
-      response.forEach((item: Workspaceitem | Workflowitem) => {
+      response.forEach((item: WorkspaceItem | WorkflowItem) => {
         const {errors} = item;
 
         if (errors && !isEmpty(errors)) {
@@ -303,7 +303,7 @@ export class SubmissionObjectEffects {
         this.notificationsService.success(null, this.translate.get('submission.sections.general.save_success_notice'));
       }
 
-      response.forEach((item: Workspaceitem | Workflowitem) => {
+      response.forEach((item: WorkspaceItem | WorkflowItem) => {
 
         let errorsList = Object.create({});
         const {errors} = item;