#288 reset non-java-client files to master (probably some auto-format…

…ting during merge)

Signed-off-by: Dominik Guggemos <dominik.guggemos@bosch.io>

javascript/lib/api/src/client/handles/things.ts

@@ -14,7 +14,7 @@
 /* tslint:disable:no-duplicate-string */
 import { GenericResponse, PutResponse } from '../../model/response';
 import { Acl, AclEntry, Thing } from '../../model/things.model';
-import { DefaultGetThingsOptions, FieldsOptions, GetThingsOptions, MatchOptions } from '../../options/request.options';
+import { FieldsOptions, GetThingsOptions, MatchOptions, DefaultGetThingsOptions } from '../../options/request.options';
 import { RequestSender, RequestSenderFactory } from '../request-factory/request-sender';
 import { HttpThingsHandleV1, HttpThingsHandleV2, WebSocketThingsHandle } from './things.interfaces';
 

javascript/lib/api/src/model/model.ts

@@ -99,8 +99,8 @@ export abstract class IndexedEntityModel<EntryType extends EntityModel> implemen
    * @param mapKey - how to get the key from an objects key.
    */
   static fromPlainObject<T extends EntityModel>(objectToMap: Object | undefined,
-                                                mapValue: (value: any, key: string) => T,
-                                                mapKey: (key: string, value: any) => string = key => key): IndexedEntityModel<T> {
+    mapValue: (value: any, key: string) => T,
+    mapKey: (key: string, value: any) => string = key => key): IndexedEntityModel<T> {
     if (objectToMap) {
       const entries = Object.keys(objectToMap)
         .map(k => {

javascript/lib/api/src/model/policies.model.ts

@@ -19,7 +19,7 @@ import { EntityModel, EntityWithId, IndexedEntityModel } from './model';
 export class Policy extends EntityWithId {
 
   public constructor(private readonly _id: string,
-                     private readonly _entries: Entries) {
+    private readonly _entries: Entries) {
     super();
   }
 
@@ -82,8 +82,8 @@ export class Entries extends IndexedEntityModel<Entry> {
 export class Entry extends EntityWithId {
 
   public constructor(private readonly _id: string,
-                     private readonly _subjects: Subjects,
-                     private readonly _resources: Resources) {
+    private readonly _subjects: Subjects,
+    private readonly _resources: Resources) {
     super();
   }
 
@@ -103,7 +103,7 @@ export class Entry extends EntityWithId {
   }
 
   public toObject(): Object {
-    const subjectsObj = Subjects.toObject(this.subjects);
+    const subjectsObj = Subjects.toObject(this.subjects) ;
     const resourcesObj = Resources.toObject(this.resources);
     return EntityModel.buildObject(new Map<string, any>([
       ['subjects', subjectsObj],
@@ -196,7 +196,7 @@ export type SubjectType = string;
 export class Subject extends EntityWithId {
 
   public constructor(private readonly _id: SubjectId,
-                     private readonly _type: SubjectType) {
+    private readonly _type: SubjectType) {
     super();
   }
 
@@ -241,8 +241,8 @@ export enum AccessRight {
 export class Resource extends EntityWithId {
 
   public constructor(private readonly _id: string,
-                     private readonly _grant: AccessRight[],
-                     private readonly _revoke: AccessRight[]) {
+    private readonly _grant: AccessRight[],
+    private readonly _revoke: AccessRight[]) {
     super();
   }
 

javascript/lib/api/src/model/things.model.ts

@@ -21,12 +21,12 @@ export class Thing extends EntityWithId {
   public static readonly NAMESPACE_SEPARATION_REGEX = /([^:]*):(.*)/;
 
   public constructor(private readonly _thingId: string,
-                     private readonly _policyId?: string,
-                     private readonly _attributes?: Record<string, any>,
-                     private readonly _features?: Features,
-                     private readonly __revision?: number,
-                     private readonly __modified?: string,
-                     private readonly _acl?: Acl) {
+    private readonly _policyId?: string,
+    private readonly _attributes?: Record<string, any>,
+    private readonly _features?: Features,
+    private readonly __revision?: number,
+    private readonly __modified?: string,
+    private readonly _acl?: Acl) {
     super();
   }
 
@@ -143,8 +143,8 @@ export class Features extends IndexedEntityModel<Feature> {
 export class Feature extends EntityWithId {
 
   public constructor(private readonly _id: string,
-                     private readonly _definition?: string[],
-                     private readonly _properties?: Record<string, any>) {
+    private readonly _definition?: string[],
+    private readonly _properties?: Record<string, any>) {
     super();
   }
 
@@ -204,9 +204,9 @@ export class Acl extends IndexedEntityModel<AclEntry> {
 export class AclEntry extends EntityWithId {
 
   public constructor(private readonly _id: string,
-                     private readonly _read: boolean,
-                     private readonly _write: boolean,
-                     private readonly _administrate: boolean) {
+    private readonly _read: boolean,
+    private readonly _write: boolean,
+    private readonly _administrate: boolean) {
     super();
   }
 

javascript/lib/api/tests/client/http/features.http.spec.ts

@@ -14,8 +14,8 @@
 /* tslint:disable:no-big-function */
 import { FeaturesHandle } from '../../../src/client/handles/features.interfaces';
 import { PutResponse } from '../../../src/model/response';
-import { Features } from '../../../src/model/things.model';
 import { HttpHelper as H } from './http.helper';
+import { Features } from '../../../src/model/things.model';
 
 describe('Http Features Handle', () => {
   const baseRequest = `things/${H.thing.thingId}/features`;

javascript/lib/api/tests/client/test.helper.ts

@@ -11,8 +11,8 @@
  * SPDX-License-Identifier: EPL-2.0
  */
 
-import { AuthProvider, DittoHeaders, DittoURL } from '../../src/auth/auth-provider';
 import { Feature, Thing } from '../../src/model/things.model';
+import { AuthProvider, DittoHeaders, DittoURL } from '../../src/auth/auth-provider';
 
 jasmine.DEFAULT_TIMEOUT_INTERVAL = 0;
 

javascript/lib/api/tests/client/websocket/commands.websocket.spec.ts

@@ -12,8 +12,8 @@
  */
 
 import { ProtocolResponseValue } from '../../../src/client/request-factory/websocket-request-handler';
-import { Features } from '../../../src/model/things.model';
 import { EventsHelper as H } from './events.helper';
+import { Features } from '../../../src/model/things.model';
 
 
 describe('WebSocket Commands Handle', () => {

javascript/lib/api/tests/client/websocket/events.websocket.spec.ts

@@ -12,8 +12,8 @@
  */
 
 import { ProtocolResponseValue } from '../../../src/client/request-factory/websocket-request-handler';
-import { Features } from '../../../src/model/things.model';
 import { EventsHelper as H } from './events.helper';
+import { Features } from '../../../src/model/things.model';
 
 
 describe('WebSocket Events Handle', () => {

javascript/lib/api/tests/client/websocket/features.websocket.spec.ts

@@ -11,8 +11,8 @@
  * SPDX-License-Identifier: EPL-2.0
  */
 
-import { Features } from '../../../src/model/things.model';
 import { WebSocketHelper as H } from './websocket.helper';
+import { Features } from '../../../src/model/things.model';
 
 // tslint:disable-next-line:no-big-function
 describe('WebSocket Features Handle', () => {

javascript/lib/api/tests/model/policies.model.spec.ts

@@ -13,16 +13,16 @@
 
 /* tslint:disable:no-duplicate-string */
 import {
-  AccessRight,
-  DittoSubjectIssuer,
+  AccessRight, DittoSubjectIssuer,
   Entries,
   Entry,
   Policy,
   Resource,
   Resources,
   Subject,
   SubjectId,
-  Subjects
+  Subjects,
+  SubjectType
 } from '../../src/model/policies.model';
 
 const aResourceObj = { grant: ['READ'], revoke: ['READ'] };
@@ -136,10 +136,7 @@ describe('Entry', () => {
     expect(Entry.fromObject(anEntryObj, 'label1').equals(anEntry)).toBe(true);
   });
   it('builds an object', () => {
-    expect(anEntry.toObject()).toEqual({
-      subjects: Subjects.toObject(someSubjects),
-      resources: Resources.toObject(someResources)
-    });
+    expect(anEntry.toObject()).toEqual({ subjects: Subjects.toObject(someSubjects), resources: Resources.toObject(someResources) });
   });
   it('returns its content', () => {
     expect(anEntry.id).toEqual('label1');

legal/templates/third-party-file.ftl

@@ -10,17 +10,17 @@
     <#assign p = e.getKey()/>
     <#assign licenses = e.getValue()/>
     <#return "## " + p.name + " (" + p.version + ")"
-    + "\n\n* Maven coordinates: `" + p.groupId + ":" + p.artifactId + ":" + p.version + "`"
-    + "\n* License: " + licenseFormat(licenses)
-    + "\n* Project: " + ((p.url)!"not declared")
-    + "\n* Sources: "
-    + "\n   * declared as SCM: " + ((p.scm.url)!"not declared")
+        + "\n\n* Maven coordinates: `" + p.groupId + ":" + p.artifactId + ":" + p.version + "`"
+        + "\n* License: " + licenseFormat(licenses)
+        + "\n* Project: " + ((p.url)!"not declared")
+        + "\n* Sources: "
+        + "\n   * declared as SCM: " + ((p.scm.url)!"not declared")
             ?replace('(git@|scm:git:git://|git://|http://)','https://','r')
             ?replace('.git','')
             ?replace('https://github.com:','https://github.com/')
-    ?replace('^github.com/','https://github.com/','r')
-    + "\n   * Maven sources: https://search.maven.org/remotecontent?filepath=" +
-    (p.groupId)?replace('.','/') + "/" + (p.artifactId) + "/" + (p.version) + "/" + (p.artifactId) + "-" + (p.version) + "-sources.jar"
+            ?replace('^github.com/','https://github.com/','r')
+        + "\n   * Maven sources: https://search.maven.org/remotecontent?filepath=" +
+            (p.groupId)?replace('.','/') + "/" + (p.artifactId) + "/" + (p.version) + "/" + (p.artifactId) + "-" + (p.version) + "-sources.jar"
         + "\n\n">
 </#function>
 # Third-party Content