more code cleanups

Author: kwalrath

public/docs/_examples/dependency-injection/dart/.analysis_options

@@ -0,0 +1,16 @@
+# Supported lint rules and documentation: http://dart-lang.github.io/linter/lints/
+linter:
+  rules:
+    - always_declare_return_types
+    - camel_case_types
+    - empty_constructor_bodies
+    - annotate_overrides
+    - avoid_init_to_null
+    - constant_identifier_names
+    - one_member_abstracts
+    - slash_for_doc_comments
+    - sort_constructors_first
+    - unnecessary_brace_in_string_interp
+
+analyzer:
+  # strong-mode: true

public/docs/_examples/dependency-injection/dart/lib/app_component.dart

@@ -42,7 +42,7 @@ import 'providers_component.dart';
 // #enddocregion providers
 )
 class AppComponent {
-  UserService _userService;
+  final UserService _userService;
   String title;
 
   //#docregion ctor

public/docs/_examples/dependency-injection/dart/lib/car/car.dart

@@ -3,7 +3,7 @@ import 'package:angular2/angular2.dart';
 
 // #docregion engine
 class Engine {
-  int cylinders = 4;
+  final int cylinders = 4;
 }
 // #enddocregion engine
 
@@ -17,8 +17,8 @@ class Tires {
 @Injectable()
 class Car {
   //#docregion car-ctor
-  Engine engine;
-  Tires tires;
+  final Engine engine;
+  final Tires tires;
   String description = 'DI';
 
   Car(this.engine, this.tires);

public/docs/_examples/dependency-injection/dart/lib/car/car_component.dart

@@ -20,9 +20,9 @@ import 'car_no_di.dart' as carNoDi;
       <div id="test">{{testCar.drive()}}</div>''',
     providers: const [Car, Engine, Tires])
 class CarComponent {
-  Car car;
+  final Car car;
 
-  CarComponent(this.car) {}
+  CarComponent(this.car);
   Car factoryCar = (new CarFactory()).createCar();
   Car injectorCar = useInjector();
   carNoDi.Car noDiCar = new carNoDi.Car();

public/docs/_examples/dependency-injection/dart/lib/car/car_creations.dart

@@ -14,7 +14,7 @@ Car simpleCar() {
 
 //#docregion car-ctor-instantiation-with-param
 class Engine2 implements Engine {
-  int cylinders;
+  final int cylinders;
 
   Engine2(this.cylinders);
 }
@@ -33,7 +33,7 @@ Car superCar() {
 
 //#docregion car-ctor-instantiation-with-mocks
 class MockEngine extends Engine {
-  int cylinders = 8;
+  final int cylinders = 8;
 }
 
 class MockTires extends Tires {

public/docs/_examples/dependency-injection/dart/lib/heroes/hero_service.dart

@@ -8,8 +8,8 @@ import 'mock_heroes.dart';
 @Injectable()
 class HeroService {
   // #docregion internals
-  Logger _logger;
-  bool _isAuthorized;
+  final Logger _logger;
+  final bool _isAuthorized;
 
   HeroService(this._logger, this._isAuthorized);
 

public/docs/_examples/dependency-injection/dart/lib/heroes/hero_service_2.dart

@@ -7,7 +7,7 @@ import 'mock_heroes.dart';
 
 @Injectable()
 class HeroService {
-  Logger _logger;
+  final Logger _logger;
 
   //#docregion ctor
   HeroService(this._logger);

public/docs/_examples/dependency-injection/dart/lib/injector_component.dart

@@ -25,7 +25,7 @@ import 'logger_service.dart';
       Logger
     ])
 class InjectorComponent {
-  Injector _injector;
+  final Injector _injector;
   Car car;
   HeroService heroService;
   Hero hero;

public/docs/_examples/dependency-injection/dart/lib/providers_component.dart

@@ -78,12 +78,12 @@ class ProviderComponent4 {
 // #docregion EvenBetterLogger
 @Injectable()
 class EvenBetterLogger implements Logger {
-  UserService _userService;
+  final UserService _userService;
   List<String> logs = [];
 
   EvenBetterLogger(this._userService);
 
-  log(String message) {
+  void log(String message) {
     var msg = 'Message to ${_userService.user.name}: $message.';
     print(msg);
     logs.add(msg);
@@ -113,7 +113,7 @@ class NewLogger extends Logger implements OldLogger {}
 class OldLogger {
   List<String> logs = [];
 
-  log(String message) {
+  void log(String message) {
     throw new Exception('Should not call the old logger!');
   }
 }
@@ -295,36 +295,47 @@ class ProviderComponent10a {
   }
 }
 
-// Optional logger
+// Optional logger, can be null
 @Component(selector: 'provider-10b', template: '{{log}}')
-class ProviderComponent10b implements OnInit {
-  Logger _logger;
-
+class ProviderComponent10b {
   // #docregion provider-10-ctor
+  final Logger _logger;
   String log;
 
-  ProviderComponent10b(@Optional() this._logger);
-
+  ProviderComponent10b(@Optional() Logger this._logger) {
+    // . . .
   // #enddocregion provider-10-ctor
-  ngOnInit() {
-    // #docregion provider-10-logger
-    // No logger? Make one!
-    if (_logger == null) {
-      _logger = new DoNothingLogger();
-      // #enddocregion provider-10-logger
-      _logger.log('Optional logger was not available.');
-    } else {
-      _logger.log('Hello from the injected logger.');
-    }
+    _logger == null ? log = 'No logger exists' : log = _logger.logs[0];
+  // #docregion provider-10-ctor
+  }
+  // #enddocregion provider-10-ctor
+}
+
+// Optional logger, non null
+@Component(selector: 'provider-10c', template: '{{log}}')
+class ProviderComponent10c {
+  // #docregion provider-10-logger
+  final Logger _logger;
+  String log;
+
+  ProviderComponent10c(@Optional() Logger logger) :
+        _logger = logger ?? new DoNothingLogger() {
+    // . . .
+    // #enddocregion provider-10-logger
+    logger == null
+        ? _logger.log('Optional logger was not available.')
+        : _logger.log('Hello from the injected logger.');
     log = _logger.logs[0];
+    // #docregion provider-10-logger
   }
+// #enddocregion provider-10-logger
 }
 
 // #docregion provider-10-logger
 // . . .
 class DoNothingLogger extends Logger {
   List<String> logs = [];
-  log(String msg) => logs.add(msg);
+  void log(String msg) => logs.add(msg);
 }
 // #enddocregion provider-10-logger
 
@@ -344,7 +355,8 @@ class DoNothingLogger extends Logger {
       <div id="p9a"><provider-9a></provider-9a></div>
       <div id="p9b"><provider-9b></provider-9b></div>
       <div id="p10a"><provider-10a></provider-10a></div>
-      <div id="p10b"><provider-10b></provider-10b></div>''',
+      <div id="p10b"><provider-10b></provider-10b></div>
+      <div id="p10c"><provider-10c></provider-10c></div>''',
     directives: const [
       ProviderComponent1,
       ProviderComponent2,
@@ -358,6 +370,7 @@ class DoNothingLogger extends Logger {
       ProviderComponent9a,
       ProviderComponent9b,
       ProviderComponent10a,
-      ProviderComponent10b
+      ProviderComponent10b,
+      ProviderComponent10c
     ])
 class ProvidersComponent {}