[CAMEL-9659] Fix checkstyle issues
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e589faa8 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e589faa8 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e589faa8 Branch: refs/heads/master Commit: e589faa820c62a03831d799d721d61dcf11cbdc7 Parents: b3eaf81 Author: Daniel Kulp <dk...@apache.org> Authored: Tue Mar 1 15:01:37 2016 -0500 Committer: Daniel Kulp <dk...@apache.org> Committed: Tue Mar 1 15:01:37 2016 -0500 ---------------------------------------------------------------------- .../camel/component/gridfs/GridFsComponent.java | 6 ++-- .../camel/component/gridfs/GridFsConsumer.java | 34 +++++++++----------- .../component/gridfs/GridFsConsumerTest.java | 26 +++++++-------- 3 files changed, 32 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/e589faa8/components/camel-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsComponent.java b/components/camel-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsComponent.java index 26da915..62701a0 100644 --- a/components/camel-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsComponent.java +++ b/components/camel-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsComponent.java @@ -16,18 +16,20 @@ */ package org.apache.camel.component.gridfs; +import java.util.Map; + import com.mongodb.Mongo; import org.apache.camel.Endpoint; import org.apache.camel.impl.UriEndpointComponent; import org.apache.camel.util.CamelContextHelper; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Map; public class GridFsComponent extends UriEndpointComponent { - private final static Logger LOG = LoggerFactory.getLogger(GridFsComponent.class); + private static final Logger LOG = LoggerFactory.getLogger(GridFsComponent.class); private volatile Mongo db; http://git-wip-us.apache.org/repos/asf/camel/blob/e589faa8/components/camel-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsConsumer.java b/components/camel-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsConsumer.java index 35d77ee..bfce711 100644 --- a/components/camel-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsConsumer.java +++ b/components/camel-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsConsumer.java @@ -1,20 +1,18 @@ /** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.camel.component.gridfs; @@ -74,11 +72,11 @@ public class GridFsConsumer extends DefaultConsumer implements Runnable { java.util.Date fromDate = null; QueryStrategy s = endpoint.getQueryStrategy(); - boolean usesTimestamp = (s != QueryStrategy.FileAttribute); - boolean persistsTimestamp = (s == QueryStrategy.PersistentTimestamp || s == QueryStrategy.PersistentTimestampAndFileAttribute); - boolean usesAttribute = (s == QueryStrategy.FileAttribute + boolean usesTimestamp = s != QueryStrategy.FileAttribute; + boolean persistsTimestamp = s == QueryStrategy.PersistentTimestamp || s == QueryStrategy.PersistentTimestampAndFileAttribute; + boolean usesAttribute = s == QueryStrategy.FileAttribute || s == QueryStrategy.TimeStampAndFileAttribute - || s == QueryStrategy.PersistentTimestampAndFileAttribute); + || s == QueryStrategy.PersistentTimestampAndFileAttribute; DBCollection ptsCollection = null; DBObject persistentTimestamp = null; http://git-wip-us.apache.org/repos/asf/camel/blob/e589faa8/components/camel-gridfs/src/test/java/org/apache/camel/component/gridfs/GridFsConsumerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-gridfs/src/test/java/org/apache/camel/component/gridfs/GridFsConsumerTest.java b/components/camel-gridfs/src/test/java/org/apache/camel/component/gridfs/GridFsConsumerTest.java index 77b1c6e..64aa1d9 100644 --- a/components/camel-gridfs/src/test/java/org/apache/camel/component/gridfs/GridFsConsumerTest.java +++ b/components/camel-gridfs/src/test/java/org/apache/camel/component/gridfs/GridFsConsumerTest.java @@ -1,20 +1,18 @@ /** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.camel.component.gridfs;