@@ -33,6 +33,11 @@ <version>3.8.1</version> <scope>test</scope> </dependency> + <dependency> + <groupId>com.google.code.findbugs</groupId> + <artifactId>annotations</artifactId> + <version>1.3.8</version> + </dependency> </dependencies> <pluginRepositories> @@ -68,8 +73,8 @@ <plugin> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <source>1.4</source> - <target>1.4</target> + <source>1.6</source> + <target>1.6</target> </configuration> </plugin> <plugin> @@ -98,7 +103,14 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>findbugs-maven-plugin</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.1</version> + <configuration> + <effort>Max</effort> + <threshold>Low</threshold> + <debug>false</debug> + <failOnError>true</failOnError> + <maxHeap>512</maxHeap> + </configuration> <executions> <execution> <id>findbugs</id> @@ -157,7 +169,7 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-pmd-plugin</artifactId> <configuration> - <targetJdk>1.4</targetJdk> + <targetJdk>1.6</targetJdk> </configuration> </plugin> <plugin> @@ -171,7 +183,14 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>findbugs-maven-plugin</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.1</version> + <configuration> + <effort>Max</effort> + <threshold>Low</threshold> + <debug>false</debug> + <failOnError>true</failOnError> + <maxHeap>512</maxHeap> + </configuration> </plugin> </plugins> </reporting> pom.xml @@ -42,8 +42,8 @@ public class SphinxClient { private static final int EXCEPTS_SINGLE_PASSAGE_FLAG = 4; private static final int EXCEPTS_EXACT_PHASE_FLAG = 2; - private static final Integer DEFAULT_EXCEPTS_AROUND = new Integer(5); - private static final Integer DEFAULT_EXCEPTS_LIMIT = new Integer(256); + private static final Integer DEFAULT_EXCEPTS_AROUND = Integer.valueOf(5); + private static final Integer DEFAULT_EXCEPTS_LIMIT = Integer.valueOf(256); private static final float MILLSEC_IN_SEC = 1000.0f; private static final int DEFAULT_LIMIT = 20; private static final int DEFAULT_SEARCHD_PORT = 3312; @@ -1313,14 +1313,14 @@ public class SphinxClient { /* handle bigints */ if (type == SPH_ATTR_BIGINT) { - docInfo.addAttribute(attrNumber, new Long(in + docInfo.addAttribute(attrNumber, Long.valueOf(in .readLong())); continue; } /* handle floats */ if (type == SPH_ATTR_FLOAT) { - docInfo.addAttribute(attrNumber, new Float(in + docInfo.addAttribute(attrNumber, Float.valueOf(in .readFloat())); continue; } @@ -1334,7 +1334,7 @@ public class SphinxClient { } docInfo.addAttribute(attrNumber, vals); } else { - docInfo.addAttribute(attrNumber, new Long(val)); + docInfo.addAttribute(attrNumber, Long.valueOf(val)); } } res.matches[matchesNo] = docInfo; @@ -1405,16 +1405,16 @@ public class SphinxClient { opts.put("around", DEFAULT_EXCEPTS_AROUND); } if (!opts.containsKey("exact_phrase")) { - opts.put("exact_phrase", new Integer(0)); + opts.put("exact_phrase", Integer.valueOf(0)); } if (!opts.containsKey("single_passage")) { - opts.put("single_passage", new Integer(0)); + opts.put("single_passage", Integer.valueOf(0)); } if (!opts.containsKey("use_boundaries")) { - opts.put("use_boundaries", new Integer(0)); + opts.put("use_boundaries", Integer.valueOf(0)); } if (!opts.containsKey("weight_order")) { - opts.put("weight_order", new Integer(0)); + opts.put("weight_order", Integer.valueOf(0)); } /* build request */ src/main/java/org/sphx/api/SphinxClient.java c49db3b5ad61b4495b09322645f2641c1d18a494 Roman Dmytrenko erka@kpumuk.info http://github.com/erka/sphinx-java-api/commit/79092cebad9e9e703b46ef312a381dd4ecc7c56d 79092cebad9e9e703b46ef312a381dd4ecc7c56d 2009-10-16T10:52:18-07:00 2009-10-16T10:52:18-07:00 switch project to Java 6 6375951b439a977c27b60dbba3303cdb7659c022 Roman Dmytrenko erka@kpumuk.info