avro-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From th...@apache.org
Subject [23/36] avro git commit: [fix] eliminate FB annotations to reduce the scope of this change.
Date Fri, 19 May 2017 17:12:37 GMT
[fix] eliminate FB annotations to reduce the scope of this change.

Project: http://git-wip-us.apache.org/repos/asf/avro/repo
Commit: http://git-wip-us.apache.org/repos/asf/avro/commit/ce1654df
Tree: http://git-wip-us.apache.org/repos/asf/avro/tree/ce1654df
Diff: http://git-wip-us.apache.org/repos/asf/avro/diff/ce1654df

Branch: refs/heads/master
Commit: ce1654df5e6b3c9e4b142678b61d36f19c9da359
Parents: 64c482f
Author: Zoltan Farkas <zolyfarkas@yahoo.com>
Authored: Fri Apr 28 13:56:17 2017 -0400
Committer: Zoltan Farkas <zolyfarkas@yahoo.com>
Committed: Fri Apr 28 13:56:17 2017 -0400

----------------------------------------------------------------------
 lang/java/compiler/pom.xml                               | 11 ++++++-----
 .../org/apache/avro/compiler/schema/SchemaVisitor.java   | 10 ----------
 .../java/org/apache/avro/compiler/schema/Schemas.java    |  2 --
 3 files changed, 6 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/avro/blob/ce1654df/lang/java/compiler/pom.xml
----------------------------------------------------------------------
diff --git a/lang/java/compiler/pom.xml b/lang/java/compiler/pom.xml
index 2a35c45..4b00215 100644
--- a/lang/java/compiler/pom.xml
+++ b/lang/java/compiler/pom.xml
@@ -138,11 +138,12 @@
       <artifactId>guava</artifactId>
       <version>${guava.version}</version>
       <scope>test</scope>
-    </dependency>
-    <dependency> <!-- apache licensed -->
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>jsr305</artifactId>
-      <version>3.0.1</version>
+      <exclusions>
+        <exclusion> <!-- GPL -->
+           <groupId>com.google.code.findbugs</groupId>
+           <artifactId>jsr305</artifactId>
+         </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>
 

http://git-wip-us.apache.org/repos/asf/avro/blob/ce1654df/lang/java/compiler/src/main/java/org/apache/avro/compiler/schema/SchemaVisitor.java
----------------------------------------------------------------------
diff --git a/lang/java/compiler/src/main/java/org/apache/avro/compiler/schema/SchemaVisitor.java
b/lang/java/compiler/src/main/java/org/apache/avro/compiler/schema/SchemaVisitor.java
index df667f4..4198355 100644
--- a/lang/java/compiler/src/main/java/org/apache/avro/compiler/schema/SchemaVisitor.java
+++ b/lang/java/compiler/src/main/java/org/apache/avro/compiler/schema/SchemaVisitor.java
@@ -17,15 +17,11 @@
  */
 package org.apache.avro.compiler.schema;
 
-import javax.annotation.CheckReturnValue;
-import javax.annotation.Nonnull;
-import javax.annotation.ParametersAreNonnullByDefault;
 import org.apache.avro.Schema;
 
 /**
  * @author zoly
  */
-@ParametersAreNonnullByDefault
 public interface SchemaVisitor<T> {
 
   /**
@@ -35,8 +31,6 @@ public interface SchemaVisitor<T> {
    * @param terminal
    * @return
    */
-  @Nonnull
-  @CheckReturnValue
   SchemaVisitorAction visitTerminal(Schema terminal);
 
   /**
@@ -44,8 +38,6 @@ public interface SchemaVisitor<T> {
    * @param nonTerminal
    * @return
    */
-  @Nonnull
-  @CheckReturnValue
   SchemaVisitorAction visitNonTerminal(Schema nonTerminal);
 
   /**
@@ -53,8 +45,6 @@ public interface SchemaVisitor<T> {
    * @param nonTerminal
    * @return
    */
-  @Nonnull
-  @CheckReturnValue
   SchemaVisitorAction afterVisitNonTerminal(Schema nonTerminal);
 
 

http://git-wip-us.apache.org/repos/asf/avro/blob/ce1654df/lang/java/compiler/src/main/java/org/apache/avro/compiler/schema/Schemas.java
----------------------------------------------------------------------
diff --git a/lang/java/compiler/src/main/java/org/apache/avro/compiler/schema/Schemas.java
b/lang/java/compiler/src/main/java/org/apache/avro/compiler/schema/Schemas.java
index 82cf0bb..0196a71 100644
--- a/lang/java/compiler/src/main/java/org/apache/avro/compiler/schema/Schemas.java
+++ b/lang/java/compiler/src/main/java/org/apache/avro/compiler/schema/Schemas.java
@@ -10,7 +10,6 @@ import java.util.IdentityHashMap;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
-import javax.annotation.ParametersAreNonnullByDefault;
 import org.apache.avro.JsonProperties;
 import org.apache.avro.LogicalType;
 import org.apache.avro.Schema;
@@ -22,7 +21,6 @@ import org.apache.avro.compiler.specific.SpecificCompiler;
  *
  * @author zoly
  */
-@ParametersAreNonnullByDefault
 public final class Schemas {
 
   private Schemas() {


Mime
View raw message