You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by th...@apache.org on 2016/06/02 18:23:39 UTC

[1/2] tika git commit: Remove duplicate code

Repository: tika
Updated Branches:
  refs/heads/TIKA-1508 ea47b716e -> 1202f459e


Remove duplicate code

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

Branch: refs/heads/TIKA-1508
Commit: 27d92909cb73356ec5231ad7002f30d3bcd917a5
Parents: 67941a6
Author: Thamme Gowda <tg...@gmail.com>
Authored: Thu Jun 2 11:22:09 2016 -0700
Committer: Thamme Gowda <tg...@gmail.com>
Committed: Thu Jun 2 11:22:09 2016 -0700

----------------------------------------------------------------------
 .../src/main/java/org/apache/tika/config/ParamField.java  | 10 ----------
 1 file changed, 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tika/blob/27d92909/tika-core/src/main/java/org/apache/tika/config/ParamField.java
----------------------------------------------------------------------
diff --git a/tika-core/src/main/java/org/apache/tika/config/ParamField.java b/tika-core/src/main/java/org/apache/tika/config/ParamField.java
index 281dd98..e2d035b 100644
--- a/tika-core/src/main/java/org/apache/tika/config/ParamField.java
+++ b/tika-core/src/main/java/org/apache/tika/config/ParamField.java
@@ -65,16 +65,6 @@ public class ParamField {
 
         Field annotation = member.getAnnotation(Field.class);
         required = annotation.required();
-        if (annotation.name().equals(DEFAULT)) {
-            if (field != null){
-                name = field.getName();
-            } else {
-                String funcName = setter.getName();
-                if (funcName.startsWith("set")) {
-                    name = funcName.replaceFirst("^set", "");
-                }
-            }
-        }
         name = retrieveParamName(annotation);
         type = retrieveType();
     }


[2/2] tika git commit: Merge branch 'TIKA-1986' into TIKA-1508

Posted by th...@apache.org.
Merge branch 'TIKA-1986' into TIKA-1508


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

Branch: refs/heads/TIKA-1508
Commit: 1202f459eadae0b8977d22d75523d6c1295222f7
Parents: ea47b71 27d9290
Author: Thamme Gowda <tg...@gmail.com>
Authored: Thu Jun 2 11:22:37 2016 -0700
Committer: Thamme Gowda <tg...@gmail.com>
Committed: Thu Jun 2 11:22:37 2016 -0700

----------------------------------------------------------------------
 .../src/main/java/org/apache/tika/config/ParamField.java  | 10 ----------
 1 file changed, 10 deletions(-)
----------------------------------------------------------------------