Yuta HIGUCHI

checkstyle

Change-Id: Ie794af1b06777c4c4332c4047ad88ecbe1b2f550
...@@ -201,7 +201,7 @@ public class FooComponent { ...@@ -201,7 +201,7 @@ public class FooComponent {
201 } else { 201 } else {
202 log.info("Write failed trying to write{}", next); 202 log.info("Write failed trying to write{}", next);
203 } 203 }
204 - } while(retry-- > 0); 204 + } while (retry-- > 0);
205 } catch (Exception e) { 205 } catch (Exception e) {
206 log.error("Exception thrown", e); 206 log.error("Exception thrown", e);
207 } 207 }
......
...@@ -34,7 +34,6 @@ import org.onlab.onos.store.service.DatabaseService; ...@@ -34,7 +34,6 @@ import org.onlab.onos.store.service.DatabaseService;
34 import org.onlab.onos.store.service.NoSuchTableException; 34 import org.onlab.onos.store.service.NoSuchTableException;
35 import org.onlab.onos.store.service.OptimisticLockException; 35 import org.onlab.onos.store.service.OptimisticLockException;
36 import org.onlab.onos.store.service.OptionalResult; 36 import org.onlab.onos.store.service.OptionalResult;
37 -import org.onlab.onos.store.service.PreconditionFailedException;
38 import org.onlab.onos.store.service.ReadRequest; 37 import org.onlab.onos.store.service.ReadRequest;
39 import org.onlab.onos.store.service.ReadResult; 38 import org.onlab.onos.store.service.ReadResult;
40 import org.onlab.onos.store.service.WriteAborted; 39 import org.onlab.onos.store.service.WriteAborted;
...@@ -195,8 +194,8 @@ public class DatabaseManager implements DatabaseService, DatabaseAdminService { ...@@ -195,8 +194,8 @@ public class DatabaseManager implements DatabaseService, DatabaseAdminService {
195 } 194 }
196 195
197 @Override 196 @Override
198 - public WriteResult write(WriteRequest request) 197 + public WriteResult write(WriteRequest request) {
199 - throws OptimisticLockException, PreconditionFailedException { 198 +// throws OptimisticLockException, PreconditionFailedException {
200 return writeNothrow(request).get(); 199 return writeNothrow(request).get();
201 } 200 }
202 201
......
...@@ -117,6 +117,8 @@ public class DatabaseStateMachine implements StateMachine { ...@@ -117,6 +117,8 @@ public class DatabaseStateMachine implements StateMachine {
117 return InternalWriteResult.Status.PREVIOUS_VERSION_MISMATCH; 117 return InternalWriteResult.Status.PREVIOUS_VERSION_MISMATCH;
118 case REMOVE: 118 case REMOVE:
119 return InternalWriteResult.Status.OK; 119 return InternalWriteResult.Status.OK;
120 + default:
121 + break;
120 } 122 }
121 log.error("Should never reach here {}", request); 123 log.error("Should never reach here {}", request);
122 return InternalWriteResult.Status.ABORTED; 124 return InternalWriteResult.Status.ABORTED;
......