Merge branch 'master' into tmp

Author: Mickaël Remars

.github/workflows/cobertura.yaml

@@ -0,0 +1,26 @@
+name: Code coverage
+
+on: [pull_request, push]
+
+jobs:
+  coverage:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 8
+        uses: actions/setup-java@v2
+        with:
+          java-version: '8'
+          distribution: 'adopt'
+      - name: Generate Coverage Data
+        uses: eskatos/gradle-command-action@v1
+        with:
+          arguments: cobertura
+          wrapper-cache-enabled: true
+          dependencies-cache-enabled: true
+          configuration-cache-enabled: true
+      - uses: codecov/codecov-action@v1
+        with:
+          files: build/reports/cobertura/coverage.xml
+          fail_ci_if_error: false

.github/workflows/gradle.yaml

@@ -0,0 +1,22 @@
+name: Java CI
+
+on: [pull_request, push]
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 8
+        uses: actions/setup-java@v2
+        with:
+          java-version: '8'
+          distribution: 'adopt'
+      - name: Run Gradle Tests
+        uses: eskatos/gradle-command-action@v1
+        with:
+          arguments: check 
+          wrapper-cache-enabled: true
+          dependencies-cache-enabled: true
+          configuration-cache-enabled: true

.travis.yml

@@ -0,0 +1,5 @@
+Copyright (c) ${year} The Go Authors. All rights reserved.
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file.
+

LICENSE.header

@@ -1,8 +1,8 @@
 RE2/J: linear time regular expression matching in Java
 ======================================================
 
-[![Build Status](https://travis-ci.org/google/re2j.svg?branch=master)](https://travis-ci.org/google/re2j)
-[![Coverage Status](https://coveralls.io/repos/github/google/re2j/badge.svg)](https://coveralls.io/github/google/re2j)
+[![Build Status](https://github.com/google/re2j/actions/workflows/gradle.yaml/badge.svg?branch=master)](https://github.com/google/re2j/actions/workflows/gradle.yaml?query=branch%3Amaster)
+[![Coverage Status](https://codecov.io/gh/google/re2j/branch/master/graph/badge.svg?token=HL6dzvQ9kK)](https://codecov.io/gh/google/re2j)
 
 RE2 is a regular expression engine that runs in time linear in the size of the
 input. RE2/J is a port of RE2 to pure Java.
@@ -74,7 +74,7 @@ If you're using Maven, you can use the following snippet in your `pom.xml` to ge
 <dependency>
   <groupId>com.google.re2j</groupId>
   <artifactId>re2j</artifactId>
-  <version>1.4</version>
+  <version>1.6</version>
 </dependency>
 ```
 

README.md

@@ -1,5 +1,9 @@
-// Copyright 2019 Google Inc. All Rights Reserved.
-
+/*
+ * Copyright (c) 2020 The Go Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
 package com.google.re2j.benchmark;
 
 import org.openjdk.jmh.annotations.Benchmark;

benchmarks/src/main/java/com/google/re2j/benchmark/BenchmarkBacktrack.java

@@ -1,5 +1,9 @@
-// Copyright 2019 Google Inc. All Rights Reserved.
-
+/*
+ * Copyright (c) 2020 The Go Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
 package com.google.re2j.benchmark;
 
 import org.openjdk.jmh.annotations.Benchmark;

benchmarks/src/main/java/com/google/re2j/benchmark/BenchmarkCompile.java

@@ -1,7 +1,13 @@
-// Copyright 2019 Google Inc. All Rights Reserved.
-
+/*
+ * Copyright (c) 2020 The Go Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
 package com.google.re2j.benchmark;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
+
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.OutputTimeUnit;
 import org.openjdk.jmh.annotations.Param;
@@ -19,8 +25,17 @@ public class BenchmarkFullMatch {
   @Param({"JDK", "RE2J"})
   private Implementations impl;
 
+  @Param({"true", "false"})
+  private boolean binary;
+
   private Implementations.Pattern pattern;
 
+  private String password = "password";
+  private byte[] password_bytes = password.getBytes(UTF_8);
+
+  private String l0ngpassword = "l0ngpassword";
+  private byte[] l0ngpassword_bytes = "l0ngpassword".getBytes(UTF_8);
+
   @Setup
   public void setup() {
     pattern =
@@ -30,7 +45,8 @@ public void setup() {
 
   @Benchmark
   public void matched(Blackhole bh) {
-    Implementations.Matcher matcher = pattern.matcher("password");
+    Implementations.Matcher matcher =
+        binary ? pattern.matcher(password_bytes) : pattern.matcher(password);
     boolean matches = matcher.matches();
     if (!matches) {
       throw new AssertionError();
@@ -40,7 +56,8 @@ public void matched(Blackhole bh) {
 
   @Benchmark
   public void notMatched(Blackhole bh) {
-    Implementations.Matcher matcher = pattern.matcher("l0ngpassword");
+    Implementations.Matcher matcher =
+        binary ? pattern.matcher(l0ngpassword_bytes) : pattern.matcher(l0ngpassword);
     boolean matches = matcher.matches();
     if (matches) {
       throw new AssertionError();

benchmarks/src/main/java/com/google/re2j/benchmark/BenchmarkFullMatch.java

@@ -1,5 +1,9 @@
-// Copyright 2019 Google Inc. All Rights Reserved.
-
+/*
+ * Copyright (c) 2020 The Go Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
 package com.google.re2j.benchmark;
 
 import org.openjdk.jmh.annotations.Benchmark;
@@ -23,8 +27,12 @@ public class BenchmarkSubMatch {
   @Param({"JDK", "RE2J"})
   private Implementations impl;
 
-  private String html =
-      new String(readFile("google-maps-contact-info.html"), StandardCharsets.UTF_8);
+  @Param({"true", "false"})
+  private boolean binary;
+
+  byte[] bytes = readFile("google-maps-contact-info.html");
+  private String html = new String(bytes, StandardCharsets.UTF_8);
+
   private Implementations.Pattern pattern;
 
   @Setup
@@ -34,7 +42,7 @@ public void setup() {
 
   @Benchmark
   public void findPhoneNumbers(Blackhole bh) {
-    Implementations.Matcher matcher = pattern.matcher(html);
+    Implementations.Matcher matcher = binary ? pattern.matcher(bytes) : pattern.matcher(html);
     int count = 0;
     while (matcher.find()) {
       bh.consume(matcher.group());

benchmarks/src/main/java/com/google/re2j/benchmark/BenchmarkSubMatch.java

@@ -1,5 +1,9 @@
-// Copyright 2019 Google Inc. All Rights Reserved.
-
+/*
+ * Copyright (c) 2020 The Go Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
 package com.google.re2j.benchmark;
 
 public enum Implementations {
@@ -76,6 +80,8 @@ public static Pattern compile(Implementations impl, String pattern) {
 
     public abstract Matcher matcher(String str);
 
+    public abstract Matcher matcher(byte[] bytes);
+
     public static class JdkPattern extends Pattern {
 
       private final java.util.regex.Pattern pattern;
@@ -88,6 +94,11 @@ public JdkPattern(String pattern) {
       public Matcher matcher(String str) {
         return new Matcher.JdkMatcher(pattern.matcher(str));
       }
+
+      @Override
+      public Matcher matcher(byte[] bytes) {
+        return new Matcher.JdkMatcher(pattern.matcher(new String(bytes)));
+      }
     }
 
     public static class Re2Pattern extends Pattern {
@@ -102,6 +113,11 @@ public Re2Pattern(String pattern) {
       public Matcher matcher(String str) {
         return new Matcher.Re2Matcher(pattern.matcher(str));
       }
+
+      @Override
+      public Matcher matcher(byte[] bytes) {
+        return new Matcher.Re2Matcher(pattern.matcher(bytes));
+      }
     }
   }
 }