From b8c6b80da1cb6118167a934daa480eb381c59e0e Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 08 Jul 2015 08:06:00 +0000
Subject: [PATCH] opendj-server-legacy maven module: Enabled "NeedBraces" checkstyle rule. This brings opendj-server-legacy's checkstyle rules closer to ForgeRock's checkstyle rules.
---
opendj-server-legacy/src/test/java/org/opends/server/controls/MatchedValuesControlTest.java | 40 ++++++++++++++++++++++++++++++----------
1 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/controls/MatchedValuesControlTest.java b/opendj-server-legacy/src/test/java/org/opends/server/controls/MatchedValuesControlTest.java
index aa55247..2915b01 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/controls/MatchedValuesControlTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/controls/MatchedValuesControlTest.java
@@ -227,11 +227,21 @@
subInitialTestCurrent = null;
subAnyTestCurrent = null;
subFinalTestCurrent = null;
- if ((i & 0x8) != 0) attTypeCurrent = attTypeTest;
- if ((i & 0x8) != 0) rawAttTypeTestCurrent = rawAttTypeTest;
- if ((i & 0x4) != 0) subInitialTestCurrent = subInitialTest;
- if ((i & 0x2) != 0) subAnyTestCurrent = subAnyTest;
- if ((i & 0x1) != 0) subFinalTestCurrent = subFinalTest;
+ if ((i & 0x8) != 0) {
+ attTypeCurrent = attTypeTest;
+ }
+ if ((i & 0x8) != 0) {
+ rawAttTypeTestCurrent = rawAttTypeTest;
+ }
+ if ((i & 0x4) != 0) {
+ subInitialTestCurrent = subInitialTest;
+ }
+ if ((i & 0x2) != 0) {
+ subAnyTestCurrent = subAnyTest;
+ }
+ if ((i & 0x1) != 0) {
+ subFinalTestCurrent = subFinalTest;
+ }
if (attTypeCurrent == null)
{
@@ -716,11 +726,21 @@
attTypeTestCurrent = null;
attValueTestCurrent = null ;
- if ((i & 0x4) != 0) attTypeTestCurrent = attTypeTest;
- if ((i & 0x4) != 0) rawAttTypeTestCurrent = rawAttTypeTest;
- if ((i & 0x2) != 0) rawMatchingRuleidTestCurrent = matchingRuleIdTest;
- if ((i & 0x2) != 0) matchingRuleidTestCurrent = matchingRule ;
- if ((i & 0x1) != 0) attValueTestCurrent = attValueTest;
+ if ((i & 0x4) != 0) {
+ attTypeTestCurrent = attTypeTest;
+ }
+ if ((i & 0x4) != 0) {
+ rawAttTypeTestCurrent = rawAttTypeTest;
+ }
+ if ((i & 0x2) != 0) {
+ rawMatchingRuleidTestCurrent = matchingRuleIdTest;
+ }
+ if ((i & 0x2) != 0) {
+ matchingRuleidTestCurrent = matchingRule ;
+ }
+ if ((i & 0x1) != 0) {
+ attValueTestCurrent = attValueTest;
+ }
boolean exceptionExpected = (attTypeTestCurrent == null)
|| (attValueTestCurrent == null) || (matchingRuleidTestCurrent == null);
--
Gitblit v1.10.0