Merge pull request #110 from delphi-hub/release/0.8.0

Release/0.8.0

Author: bhermann

app/actors/ClientSocketActor.scala

@@ -47,7 +47,7 @@ class ClientSocketActor(out: ActorRef, publisher: ActorRef) extends Actor with E
           }
         }
       )
-      
+
     case SocketMessage(event, payload) =>
       Logger.debug("received socket message in client" + SocketMessage)
       if (!myEvents.contains(event)) {

app/actors/PublishSocketMessageActor.scala

@@ -22,7 +22,7 @@ object PublishSocketMessageActor {
 }
 
 class PublishSocketMessageActor(irBasePath: String, mat: Materializer, actorSys: ActorSystem) extends Actor with EventJsonSupport {
-  
+
   val eventActorMap: mutable.HashMap[EventType, ListBuffer[ActorRef]] = new mutable.HashMap[EventType, ListBuffer[ActorRef]]()
 
   override def preStart() {
@@ -46,9 +46,9 @@ class PublishSocketMessageActor(irBasePath: String, mat: Materializer, actorSys:
   override def postStop() {
     Logger.debug("post stop called in publisher" + self)
   }
-  
+
   def receive: PartialFunction[Any, Unit] = {
-    
+
     case StopMessage(toStop) =>
       Logger.debug("stop received" + toStop)
       for ((k, v) <- eventActorMap) v -= toStop

app/controllers/ApiRouter.scala

@@ -45,4 +45,4 @@ class ApiRouter @Inject()(irController: InstanceRegistryController, sysControlle
     case POST(p"/deleteInstance" ? q"instanceID=$instanceID") => irController.handleRequest(action="/delete", instanceID)
 
   }
-}
+}

app/controllers/FrontendController.scala

@@ -39,4 +39,4 @@ class FrontendController @Inject()(assets: Assets, errorHandler: HttpErrorHandle
   def assetOrDefault(resource: String): Action[AnyContent] =
     if (resource.contains(".")) assets.at(resource) else index
 
-}
+}

app/controllers/InstanceRegistryController.scala

@@ -62,7 +62,7 @@ class InstanceRegistryController @Inject()(implicit system: ActorSystem, mat: Ma
 
   val instanceRegistryUri = config.get[String]("app.instanceRegistryUri")
   val instanceRegistryBasePath = config.get[String]("app.instanceRegistryBasePath")
-  
+
   def instances(componentType: String): Action[AnyContent] = Action.async {
 
     ws.url(instanceRegistryUri + "/instances").addQueryStringParameters("ComponentType" -> componentType).get().map { response =>
@@ -133,9 +133,11 @@ class InstanceRegistryController @Inject()(implicit system: ActorSystem, mat: Ma
       .post("")
       .map { response =>
         response.status match {
+          // scalastyle:off magic.number
           case 202 =>
+          // scalastyle:on magic.number
             Ok(response.body)
-          case x =>
+          case x: Any =>
             new Status(x)
         }
       }(myExecutionContext)

app/controllers/SystemInfoController.scala

@@ -63,4 +63,4 @@
        PlayVersion.current
    }
 
- }
+ }

app/module/Module.scala

@@ -60,4 +60,4 @@ class Module extends AbstractModule with ScalaModule {
   def configure() {
     bind(classOf[MyExecutionContext]).to(classOf[MyExecutionContextImpl])
   }
-}
+}

build.sbt

@@ -4,15 +4,24 @@ name := "delphi-management"
 
 organization := "de.upb"
 
+
 version := "0.9.0-SNAPSHOT"
 
+
 scalaVersion := "2.12.4"
 
 lazy val management = (project in file(".")).enablePlugins(SbtWeb).enablePlugins(PlayScala)
                                       .enablePlugins(BuildInfoPlugin).
                                         settings(
                                           buildInfoKeys := Seq[BuildInfoKey](name, version, scalaVersion, sbtVersion),
-                                          buildInfoPackage := "de.upb.cs.swt.delphi.management"
+                                          buildInfoPackage := "de.upb.cs.swt.delphi.management",
+                                          (scalastyleSources in Compile) := {
+                                            // all .scala files in "src/main/scala"
+                                            val scalaSourceFiles = ((scalaSource in Compile).value ** "*.scala").get    
+                                            val fSep = java.io.File.separator // "/" or "\"
+                                            val dirNameToExclude = "app" + fSep + "models" // "com/folder_to_exclude"
+                                            scalaSourceFiles.filterNot(_.getAbsolutePath.contains(dirNameToExclude))
+                                          }
                                         )
 
 scalastyleConfig := baseDirectory.value / "project" / "scalastyle-config.xml"

client/README.md

@@ -11,17 +11,13 @@ Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app w
 Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`.
 
 ## Build
-Install the swagger-codegen tool available here: https://github.com/swagger-api/swagger-codegen . 
+Install the swagger-codegen tool available here: [swagger](https://github.com/swagger-api/swagger-codegen) . 
 Run `ng build` to build the project. The build artifacts will be stored in the `../public` directory. Use the `--prod` flag for a production build.
 
 ## Running unit tests
 
 Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
 
-## Running end-to-end tests
-
-Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
-
 ## Further help
 
 To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).

client/angular.json

@@ -98,33 +98,6 @@
           }
         }
       }
-    },
-    "client-e2e": {
-      "root": "e2e/",
-      "projectType": "application",
-      "architect": {
-        "e2e": {
-          "builder": "@angular-devkit/build-angular:protractor",
-          "options": {
-            "protractorConfig": "e2e/protractor.conf.js",
-            "devServerTarget": "client:serve"
-          },
-          "configurations": {
-            "production": {
-              "devServerTarget": "client:serve:production"
-            }
-          }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": "e2e/tsconfig.e2e.json",
-            "exclude": [
-              "**/node_modules/**"
-            ]
-          }
-        }
-      }
     }
   },
   "defaultProject": "client"