jdk/hs: da4fb7d2f917 (original) (raw)

OpenJDK / jdk / hs

changeset 47836:da4fb7d2f917

8024352: MBeanOperationInfo accepts any int value as "impact" Summary: MBeanOperationInfo throw an llegalArgumentException if the impact argument is not among the defined values Reviewed-by: rriggs, dfuchs, mchung Contributed-by: ujwal.vangapally@oracle.com

uvangapally
date	Fri, 17 Nov 2017 11:08:44 +0530
parents	d6d00f785f39
children	b4d2929683b6
files	src/java.management/share/classes/javax/management/MBeanOperationInfo.java test/jdk/javax/management/MBeanInfo/MBeanInfoHashCodeNPETest.java test/jdk/javax/management/mxbean/MBeanOperationInfoImpactRangeTest.java
diffstat	3 files changed, 104 insertions(+), 8 deletions(-)[+] [-] src/java.management/share/classes/javax/management/MBeanOperationInfo.java 14 test/jdk/javax/management/MBeanInfo/MBeanInfoHashCodeNPETest.java 6 test/jdk/javax/management/mxbean/MBeanOperationInfoImpactRangeTest.java 92

line wrap: on

line diff

--- a/src/java.management/share/classes/javax/management/MBeanOperationInfo.java Thu Nov 16 19:01:01 2017 -0800 +++ b/src/java.management/share/classes/javax/management/MBeanOperationInfo.java Fri Nov 17 11:08:44 2017 +0530 @@ -1,5 +1,5 @@ /*

- Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.

- Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *
- This code is free software; you can redistribute it and/or modify it @@ -146,6 +146,9 @@
  - @param descriptor The descriptor for the operation. This may be null
  - which is equivalent to an empty descriptor. *

* @throws IllegalArgumentException if {@code impact} is not one of[](#l1.14)

* {@linkplain #ACTION}, {@linkplain #ACTION_INFO}, {@linkplain #INFO} or {@linkplain #UNKNOWN}.[](#l1.15)

```
*[](#l1.16)
* @since 1.6[](#l1.17)
*/[](#l1.18)
```
public MBeanOperationInfo(String name, @@ -157,6 +160,12 @@ super(name, description, descriptor);

   if (impact < INFO || impact > UNKNOWN) {[](#l1.24)

       throw new IllegalArgumentException("Argument impact can only be "[](#l1.25)

               + "one of ACTION, ACTION_INFO, "[](#l1.26)

               + "INFO, or UNKNOWN" + " given value is :" + impact);[](#l1.27)

```
   }[](#l1.28)
```

+ if (signature == null || signature.length == 0) signature = MBeanParameterInfo.NO_PARAMS; else @@ -259,8 +268,7 @@ case ACTION: impactString = "action"; break; case ACTION_INFO: impactString = "action/info"; break; case INFO: impactString = "info"; break;

   case UNKNOWN: impactString = "unknown"; break;[](#l1.37)

   default: impactString = "(" + getImpact() + ")";[](#l1.38)

   default: impactString = "unknown";[](#l1.39)
   }[](#l1.40)
   return getClass().getName() + "[" +[](#l1.41)
       "description=" + getDescription() + ", " +[](#l1.42)

--- a/test/jdk/javax/management/MBeanInfo/MBeanInfoHashCodeNPETest.java Thu Nov 16 19:01:01 2017 -0800 +++ b/test/jdk/javax/management/MBeanInfo/MBeanInfoHashCodeNPETest.java Fri Nov 17 11:08:44 2017 +0530 @@ -1,5 +1,5 @@ /*

- Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.

- Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *
- This code is free software; you can redistribute it and/or modify it @@ -97,10 +97,6 @@ test(mbeanOperationInfo, "type");

mbeanOperationInfo = new MBeanOperationInfo(

           "name", "description", new MBeanParameterInfo[]{}, "type", -1, new DescriptorSupport());[](#l2.14)

   test(mbeanOperationInfo, "native impact");[](#l2.15)

   mbeanOperationInfo = new MBeanOperationInfo([](#l2.17)
           "name", "description", new MBeanParameterInfo[]{}, "type", 1, null);[](#l2.18)
   test(mbeanOperationInfo, "Descriptor");[](#l2.19)

--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/jdk/javax/management/mxbean/MBeanOperationInfoImpactRangeTest.java Fri Nov 17 11:08:44 2017 +0530 @@ -0,0 +1,92 @@ +/*

- Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
*
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
*
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
*/ +
/*
- @test
- @bug 8024352
- @modules java.management
- @run main MBeanOperationInfoImpactRangeTest
- @summary Check that MBeanOperationInfo throws an IllegalArgumentException when impact
- value is not among INFO,ACTION,ACTION_INFO,UNKNOWN
*/ +import javax.management.MBeanOperationInfo; + +public class MBeanOperationInfoImpactRangeTest { +
private void checkInRange(int impact) {
```
   int impactValue;[](#l3.40)
```

   System.out.println("checking that no exception is thrown when a "[](#l3.42)

           + "value in range is passed, impact value is :" + impact );[](#l3.43)

   MBeanOperationInfo mbi = new MBeanOperationInfo("IRC", "impact Range"[](#l3.44)

           + " check", null, null, impact);[](#l3.45)

   impactValue = mbi.getImpact();[](#l3.46)

```
   if(impactValue != impact)[](#l3.47)
```

       throw new RuntimeException("unexpected impact value :" + impactValue);[](#l3.48)

   System.out.println("given value is :" + impactValue);[](#l3.49)

   System.out.println("Success no exception thrown");[](#l3.50)

   System.out.println(mbi.toString());[](#l3.51)

}

private void checkOutOfRange(int impact) {
```
   int impactValue;[](#l3.56)
```

```
   try {[](#l3.58)
```

       System.out.println("checking that exception is thrown when a value"[](#l3.59)

               + " out of range is passed, impact value is :" + impact);[](#l3.60)

       MBeanOperationInfo mbi = new MBeanOperationInfo("IRC", "impact Range"[](#l3.61)

               + " check", null, null, impact);[](#l3.62)

       impactValue = mbi.getImpact();[](#l3.63)

       System.out.println("IllegalArgumentException not thrown"[](#l3.64)

               + " when a value out of range is passed ,"[](#l3.65)

               + " given value is :" + impactValue);[](#l3.66)

       throw new RuntimeException("Test failed !!");[](#l3.67)

       // throwing RuntimeException for notifying the unusual behaviour[](#l3.68)

   } catch (IllegalArgumentException e) {[](#l3.69)

       System.out.println("IllegalArgumentException thrown as expected, "[](#l3.70)

               + "illegal value given as impact :" + impact);[](#l3.71)

       System.out.println("success");[](#l3.72)

```
   }[](#l3.73)
```

}

public static void main(String Args[]) {

   // valid range for impact is {INFO=0,ACTION=1,ACTION_INFO=2,UNKNOWN=3}[](#l3.79)

   /* MBeanOperationInfo should throw IllegalArgumentException when impact[](#l3.80)

   value is given out of range*/[](#l3.81)

   MBeanOperationInfoImpactRangeTest impactRangeTest = new MBeanOperationInfoImpactRangeTest();[](#l3.82)

   impactRangeTest.checkInRange(MBeanOperationInfo.INFO);[](#l3.84)

   impactRangeTest.checkInRange(MBeanOperationInfo.ACTION);[](#l3.85)

   impactRangeTest.checkInRange(MBeanOperationInfo.ACTION_INFO);[](#l3.86)

   impactRangeTest.checkInRange(MBeanOperationInfo.UNKNOWN);[](#l3.87)

   impactRangeTest.checkOutOfRange(-1);[](#l3.88)

   impactRangeTest.checkOutOfRange(4);[](#l3.89)

   System.out.println("Test Passed");[](#l3.91)

+ +

}

+} \ No newline at end of file