SHIBUI-598 Moving type files

TIER · Jun 13, 2018 · 389c564 · 389c564
1 parent 7b32bfd
commit 389c564
Show file tree

Hide file tree

Showing 10 changed files with 47 additions and 107 deletions.
diff --git a/ui/src/app/domain/domain.type.ts b/ui/src/app/domain/domain.type.ts
diff --git a/ui/src/app/domain/model/metadata-base.ts b/ui/src/app/domain/model/metadata-base.ts
diff --git a/ui/src/app/metadata/domain/domain.type.ts b/ui/src/app/metadata/domain/domain.type.ts
@@ -4,13 +4,36 @@ import {
     MetadataFilter
 } from './model';
 
+import {
+    EntityAttributesFilter,
+    FileBackedHttpMetadataResolver,
+    FileBackedHttpMetadataProvider
+} from './entity';
+
+export type Filter =
+    | EntityAttributesFilter;
+
+export type Resolver =
+    | FileBackedHttpMetadataResolver;
+
+export type Provider =
+    | FileBackedHttpMetadataProvider;
+
+export type Entity =
+    | Filter
+    | Resolver
+    | Provider;
+
+export type Metadata =
+    | MetadataProvider
+    | MetadataResolver
+    | MetadataFilter;
+
 export enum MetadataTypes {
     FILTER = '[Type] Metadata Filter',
     PROVIDER = '[Type] Metadata Provider',
     RESOLVER = '[Type] Metadata Resolver'
 }
 
-export type Metadata =
-    | MetadataProvider
-    | MetadataResolver
-    | MetadataFilter;
+export * from './model';
+export * from './entity';
diff --git a/...domain/entity/entity-attributes.filter.ts → ...entity/filter/entity-attributes-filter.ts b/...domain/entity/entity-attributes.filter.ts → ...entity/filter/entity-attributes-filter.ts
@@ -1,8 +1,8 @@
-import { MetadataFilter, RelyingPartyOverrides } from '../model/metadata-filter';
-import { DomainEntityKinds } from '../domain.type';
-import { FilterTarget } from '../model/filter-target';
+import { MetadataFilter, MetadataEntity, RelyingPartyOverrides } from '../../model';
+import { MetadataTypes } from '../../domain.type';
+import { FilterTarget } from '../../model';
 
-export class EntityAttributesFilter implements MetadataFilter {
+export class EntityAttributesFilter implements MetadataFilter, MetadataEntity {
     createdDate?: string;
     modifiedDate?: string;
     version: string;
@@ -42,7 +42,7 @@ export class EntityAttributesFilter implements MetadataFilter {
     }
 
     get kind(): string {
-        return DomainEntityKinds.filter;
+        return MetadataTypes.FILTER;
     }
 
     get entityId(): string {

diff --git a/ui/src/app/metadata/domain/entity/index.ts b/ui/src/app/metadata/domain/entity/index.ts
@@ -0,0 +1,3 @@
+export * from './filter/entity-attributes-filter';
+export * from './provider/file-backed-http-metadata-provider';
+export * from './resolver/file-backed-http-metadata-resolver';
diff --git a/.../metadata/domain/model/provider.entity.ts → ...der/file-backed-http-metadata-provider.ts b/.../metadata/domain/model/provider.entity.ts → ...der/file-backed-http-metadata-provider.ts
@@ -10,10 +10,10 @@ import {
     SsoService,
     IdpSsoDescriptor,
     RelyingPartyOverrides
-} from '../model';
-import { MetadataTypes } from '../domain.type';
+} from '../../model';
+import { MetadataTypes } from '../../domain.type';
 
-export class Provider implements MetadataProvider, MetadataEntity {
+export class FileBackedHttpMetadataProvider implements MetadataProvider, MetadataEntity {
     id = '';
     createdDate?: string;
     modifiedDate?: string;
@@ -61,7 +61,7 @@ export class Provider implements MetadataProvider, MetadataEntity {
     }
 
     get kind(): string {
-        return DomainEntityKinds.provider;
+        return MetadataTypes.PROVIDER;
     }
 
     serialize(): any {

diff --git a/...data/domain/model/provider.entity.spec.ts → ...ile-backed-http-metadata-resolver.spec.ts b/...data/domain/model/provider.entity.spec.ts → ...ile-backed-http-metadata-resolver.spec.ts
@@ -1,4 +1,4 @@
-import { Resolver } from './resolver.entity';
+import { FileBackedHttpMetadataResolver } from './file-backed-http-metadata-resolver';
 
 describe('Resolver construct', () => {
 
@@ -83,7 +83,7 @@ describe('Resolver construct', () => {
             'mail'
         ]
     };
-    const entity = new Resolver(config);
+    const entity = new FileBackedHttpMetadataResolver(config);
 
     it('should populate its own values', () => {
         Object.keys(config).forEach(key => {

diff --git a/.../metadata/domain/model/resolver.entity.ts → ...ver/file-backed-http-metadata-resolver.ts b/.../metadata/domain/model/resolver.entity.ts → ...ver/file-backed-http-metadata-resolver.ts
@@ -9,11 +9,11 @@ import {
     SsoService,
     IdpSsoDescriptor,
     RelyingPartyOverrides
-} from '../model';
-import { MetadataTypes } from '../domain.type';
-import { MetadataEntity } from '../model/metadata-entity';
+} from '../../model';
+import { MetadataTypes } from '../../domain.type';
+import { MetadataEntity } from '../../model/metadata-entity';
 
-export class Resolver implements MetadataProvider, MetadataEntity {
+export class FileBackedHttpMetadataResolver implements MetadataProvider, MetadataEntity {
     id = '';
     createdDate?: string;
     modifiedDate?: string;
@@ -60,7 +60,7 @@ export class Resolver implements MetadataProvider, MetadataEntity {
         return this.serviceEnabled;
     }
 
-    get type(): string {
+    get kind(): string {
         return MetadataTypes.RESOLVER;
     }
 

diff --git a/ui/src/app/metadata/domain/model/filter.entity.ts b/ui/src/app/metadata/domain/model/filter.entity.ts
diff --git a/ui/src/app/metadata/domain/model/metadata-entity.ts b/ui/src/app/metadata/domain/model/metadata-entity.ts
@@ -1,7 +1,7 @@
 export interface MetadataEntity {
     name: string;
     enabled: boolean;
-    type: string;
+    kind: string;
 
     serialize(): any;
 }