Update to the latest version of vertx and Java 10 (using the var keyword)

paulbakker · paulbakker · commit 8983fef5050d · 2018-04-07T11:21:12.000-07:00
diff --git a/easytext.algorithm.api/src/main/java/javamodularity/easytext/algorithm/api/Preprocessing.java b/easytext.algorithm.api/src/main/java/javamodularity/easytext/algorithm/api/Preprocessing.java
@@ -6,10 +6,10 @@
 public class Preprocessing {
 
    public static List<List<String>> toSentences(String text) {
-      String removedBreaks = text.replaceAll("\\r?\\n", " ");
+      var removedBreaks = text.replaceAll("\\r?\\n", " ");
       ArrayList<List<String>> sentences = new ArrayList<>();
-      for(String rawSentence: removedBreaks.split("[\\.\\?\\!]")) {
-         List<String> words = toWords(rawSentence);
+      for(var rawSentence: removedBreaks.split("[\\.\\?\\!]")) {
+         var words = toWords(rawSentence);
          if(words.size() > 0) {
             sentences.add(words);
          }
@@ -18,11 +18,11 @@ public static List<List<String>> toSentences(String text) {
       return sentences;
    }
    
-   public static List<String> toWords(String sentence) {
-      String[] rawWords = sentence.split("\\s+");
+   private static List<String> toWords(String sentence) {
+      var rawWords = sentence.split("\\s+");
       List<String> words = new ArrayList<>();
-      for(String rawWord: rawWords) {
-         String word = rawWord.replaceAll("\\W", "");
+      for(var rawWord: rawWords) {
+         var word = rawWord.replaceAll("\\W", "");
          if(word.length() > 0) {
             words.add(word);
          }
diff --git a/easytext.algorithm.coleman/src/main/java/javamodularity/easytext/algorithm/coleman/ColemanAnalyzer.java b/easytext.algorithm.coleman/src/main/java/javamodularity/easytext/algorithm/coleman/ColemanAnalyzer.java
@@ -13,8 +13,8 @@ public String getName() {
 
    public double analyze(List<List<String>> sentences) {
       float totalsentences = sentences.size();
-      float words = sentences.stream().mapToInt(sentence -> sentence.size()).sum();
-      float letters = sentences.stream().flatMapToInt(sentence -> sentence.stream().mapToInt(word -> word.length())).sum();
+      float words = sentences.stream().mapToInt(List::size).sum();
+      float letters = sentences.stream().flatMapToInt(sentence -> sentence.stream().mapToInt(String::length)).sum();
       try {
          TimeUnit.SECONDS.sleep(1);
       } catch (InterruptedException e) {
diff --git a/easytext.algorithm.kincaid/src/main/java/javamodularity/easytext/algorithm/kincaid/KincaidAnalyzer.java b/easytext.algorithm.kincaid/src/main/java/javamodularity/easytext/algorithm/kincaid/KincaidAnalyzer.java
@@ -12,7 +12,7 @@ public class KincaidAnalyzer implements Analyzer {
    private SyllableCounter syllableCounter;
 
    public KincaidAnalyzer() {
-      Iterator<SyllableCounter> counters = ServiceLoader.load(SyllableCounter.class).iterator();
+      var counters = ServiceLoader.load(SyllableCounter.class).iterator();
       if(counters.hasNext()) {
          this.syllableCounter =  counters.next();
       } else {
@@ -26,7 +26,7 @@ public String getName() {
 
    public double analyze(List<List<String>> sentences) {
       float totalsentences = sentences.size();
-      float totalwords = sentences.stream().mapToInt(sentence -> sentence.size()).sum();
+      float totalwords = sentences.stream().mapToInt(List::size).sum();
       float totalsyllables = sentences.stream()
          .flatMapToInt(sentence ->
             sentence.stream().mapToInt(word -> syllableCounter.countSyllables(word)))
diff --git a/easytext.algorithm.naivesyllablecounter/src/main/java/javamodularity/easytext/algorithm/naivesyllablecounter/NaiveSyllableCounter.java b/easytext.algorithm.naivesyllablecounter/src/main/java/javamodularity/easytext/algorithm/naivesyllablecounter/NaiveSyllableCounter.java
@@ -6,10 +6,10 @@ public class NaiveSyllableCounter implements SyllableCounter {
    
    @Override
    public int countSyllables(String word) {
-      int syllables = 0;
-      boolean prevNonVowel = false;
-      for(int i = 0; i < word.length(); i++) {
-         boolean isVowel = isVowel(word.toLowerCase().charAt(i));
+       var syllables = 0;
+       var prevNonVowel = false;
+      for(var i = 0; i < word.length(); i++) {
+          var isVowel = isVowel(word.toLowerCase().charAt(i));
          if(prevNonVowel && isVowel && i != word.length() - 1) {
             syllables++;
          }
diff --git a/easytext.pagefetch/build.gradle b/easytext.pagefetch/build.gradle
@@ -4,6 +4,6 @@ plugins {
 }
 
 dependencies {
-    compile 'io.vertx:vertx-web-client:3.5.0'
-    compile 'io.vertx:vertx-rx-java2:3.5.0'
+    compile 'io.vertx:vertx-web-client:3.5.1'
+    compile 'io.vertx:vertx-rx-java2:3.5.1'
 }
diff --git a/easytext.pagefetch/src/main/java/javamodularity/easytext/pagefetch/impl/WikipediaFetchImpl.java b/easytext.pagefetch/src/main/java/javamodularity/easytext/pagefetch/impl/WikipediaFetchImpl.java
@@ -10,17 +10,16 @@
 
 public class WikipediaFetchImpl implements WikipediaFetcher {
 
-    private final Vertx vertx;
     private final WebClient client;
 
     public WikipediaFetchImpl() {
-        vertx = ServiceLoader.load(Vertx.class).findFirst().get();
+        var vertx = ServiceLoader.load(Vertx.class).findFirst().get();
         client = WebClient.create(vertx);
     }
 
     @Override
     public Single<String> getText(String topic) {
-        String url = "https://en.wikipedia.org/w/index.php?action=raw&title=" + topic;
+        var url = "https://en.wikipedia.org/w/index.php?action=raw&title=" + topic;
 
         return client.getAbs(url).rxSend()
             .map(HttpResponse::bodyAsString);
diff --git a/easytext.pagefetch/src/main/java/module-info.java b/easytext.pagefetch/src/main/java/module-info.java
@@ -2,11 +2,10 @@
 import javamodularity.easytext.pagefetch.impl.WikipediaFetchImpl;
 
 module easytext.pagefetch {
-    requires transitive reactive.streams;
 
     requires vertx.rx.java2;
     requires vertx.web.client;
-    requires rxjava;
+    requires io.reactivex.rxjava2;
     exports javamodularity.easytext.pagefetch;
 
     uses io.vertx.reactivex.core.Vertx;
diff --git a/easytext.vertx/build.gradle b/easytext.vertx/build.gradle
@@ -4,5 +4,5 @@ plugins {
 }
 
 dependencies {
-    compile 'io.vertx:vertx-rx-java2:3.5.0'
+    compile 'io.vertx:vertx-rx-java2:3.5.1'
 }
diff --git a/easytext.web/build.gradle b/easytext.web/build.gradle
@@ -5,7 +5,7 @@ plugins {
 }
 
 dependencies {
-    compile 'io.vertx:vertx-rx-java2:3.5.0'
+    compile 'io.vertx:vertx-rx-java2:3.5.1'
     compile project(':easytext.pagefetch')
     compile project(':easytext.vertx')
     compile project(':easytext.algorithm.api')
diff --git a/easytext.web/src/main/java/javamodularity/easytext/web/Main.java b/easytext.web/src/main/java/javamodularity/easytext/web/Main.java
@@ -4,8 +4,6 @@
 import io.reactivex.Observable;
 import io.reactivex.schedulers.Schedulers;
 import io.vertx.reactivex.core.Vertx;
-import io.vertx.reactivex.core.http.HttpServer;
-import io.vertx.reactivex.core.http.HttpServerResponse;
 import javamodularity.easytext.algorithm.api.Analyzer;
 import javamodularity.easytext.algorithm.api.Preprocessing;
 import javamodularity.easytext.pagefetch.WikipediaFetcher;
@@ -15,17 +13,17 @@
 public class Main {
     public static void main(String[] args) {
 
-        WikipediaFetcher wikipediaFetcher = ServiceLoader.load(WikipediaFetcher.class).findFirst().get();
+        var wikipediaFetcher = ServiceLoader.load(WikipediaFetcher.class).findFirst().get();
 
-        ServiceLoader<Analyzer> analyzers = ServiceLoader.load(Analyzer.class);
+        var analyzers = ServiceLoader.load(Analyzer.class);
 
-        Vertx vertx = ServiceLoader.load(Vertx.class).findFirst().get();
-        HttpServer server = vertx.createHttpServer();
+        var vertx = ServiceLoader.load(Vertx.class).findFirst().get();
+        var server = vertx.createHttpServer();
 
         server.requestHandler(request -> {
-            HttpServerResponse response = request.response();
+            var response = request.response();
 
-            String topic = request.getParam("topic");
+            var topic = request.getParam("topic");
 
             if (topic == null) {
                 request.response().setStatusCode(400).end("No topic set");
@@ -39,7 +37,7 @@ public static void main(String[] args) {
                 wikipediaFetcher.getText(topic).subscribeOn(Schedulers.computation()).toObservable()
                         .map(Preprocessing::toSentences)
                         .flatMap(text -> Observable.fromIterable(analyzers).flatMap(a -> Observable.create(observer -> {
-                            String result = a.getName() + ": " + a.analyze(text);
+                            var result = a.getName() + ": " + a.analyze(text);
                             observer.onNext(result);
                         }).subscribeOn(Schedulers.computation())))
                         .subscribe(text -> {
@@ -54,8 +52,6 @@ public static void main(String[] args) {
 
         });
 
-        server.listen(8080, result -> {
-            System.out.println("Server listening: " + result.succeeded());
-        });
+        server.listen(8080, result -> System.out.println("Server listening: " + result.succeeded()));
     }
 }
diff --git a/easytext.web/src/main/java/module-info.java b/easytext.web/src/main/java/module-info.java
@@ -2,7 +2,8 @@
     requires vertx.rx.java2;
     requires easytext.pagefetch;
     requires easytext.algorithm.api;
-    requires rxjava;
+    requires io.reactivex.rxjava2;
+    requires vertx.core;
 
     uses io.vertx.reactivex.core.Vertx;
     uses javamodularity.easytext.pagefetch.WikipediaFetcher;
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Oct 26 16:57:14 PDT 2017
+#Sat Apr 07 10:30:02 PDT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/java9-vertx.iml b/java9-vertx.iml
@@ -5,7 +5,6 @@
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
-      <excludeFolder url="file://$MODULE_DIR$/out" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@ plugins {`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`dependencies {`
`7`		`- compile 'io.vertx:vertx-web-client:3.5.0'`
`8`		`- compile 'io.vertx:vertx-rx-java2:3.5.0'`
	`7`	`+ compile 'io.vertx:vertx-web-client:3.5.1'`
	`8`	`+ compile 'io.vertx:vertx-rx-java2:3.5.1'`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,5 @@ plugins {`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`dependencies {`
`7`		`- compile 'io.vertx:vertx-rx-java2:3.5.0'`
	`7`	`+ compile 'io.vertx:vertx-rx-java2:3.5.1'`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ plugins {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`dependencies {`
`8`		`- compile 'io.vertx:vertx-rx-java2:3.5.0'`
	`8`	`+ compile 'io.vertx:vertx-rx-java2:3.5.1'`
`9`	`9`	`compile project(':easytext.pagefetch')`
`10`	`10`	`compile project(':easytext.vertx')`
`11`	`11`	`compile project(':easytext.algorithm.api')`