Merge pull request #608 from benjamin-confino/checkstyle

Fix all checkstyle errors

Author: Azquelt

api/src/main/java/org/eclipse/microprofile/openapi/models/PathItem.java

@@ -120,6 +120,7 @@ default PathItem description(String description) {
      *            definition of a GET operation
      * @return the current PathItem instance
      **/
+    @SuppressWarnings("checkstyle:methodname")
     default PathItem GET(Operation get) {
         setGET(get);
         return this;
@@ -147,6 +148,7 @@ default PathItem GET(Operation get) {
      *            definition of a PUT operation
      * @return the current PathItem instance
      **/
+    @SuppressWarnings("checkstyle:methodname")
     default PathItem PUT(Operation put) {
         setPUT(put);
         return this;
@@ -174,6 +176,7 @@ default PathItem PUT(Operation put) {
      *            definition of a PUT operation
      * @return the current PathItem instance
      **/
+    @SuppressWarnings("checkstyle:methodname")
     default PathItem POST(Operation post) {
         setPOST(post);
         return this;
@@ -201,6 +204,7 @@ default PathItem POST(Operation post) {
      *            definition of a DELETE operation
      * @return the current PathItem instance
      **/
+    @SuppressWarnings("checkstyle:methodname")
     default PathItem DELETE(Operation delete) {
         setDELETE(delete);
         return this;
@@ -228,6 +232,7 @@ default PathItem DELETE(Operation delete) {
      *            definition of an OPTIONS operation
      * @return the current PathItem instance
      **/
+    @SuppressWarnings("checkstyle:methodname")
     default PathItem OPTIONS(Operation options) {
         setOPTIONS(options);
         return this;
@@ -255,6 +260,7 @@ default PathItem OPTIONS(Operation options) {
      *            definition of a HEAD operation
      * @return the current PathItem instance
      **/
+    @SuppressWarnings("checkstyle:methodname")
     default PathItem HEAD(Operation head) {
         setHEAD(head);
         return this;
@@ -282,6 +288,7 @@ default PathItem HEAD(Operation head) {
      *            definition of a PATCH operation
      * @return the current PathItem instance
      **/
+    @SuppressWarnings("checkstyle:methodname")
     default PathItem PATCH(Operation patch) {
         setPATCH(patch);
         return this;
@@ -309,6 +316,7 @@ default PathItem PATCH(Operation patch) {
      *            definition of a TRACE operation
      * @return the current PathItem instance
      **/
+    @SuppressWarnings("checkstyle:methodname")
     default PathItem TRACE(Operation trace) {
         setTRACE(trace);
         return this;
@@ -420,4 +428,4 @@ default PathItem parameters(List<Parameter> parameters) {
      **/
     void removeParameter(Parameter parameter);
 
-}
+}

pom.xml

@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.eclipse.microprofile</groupId>
         <artifactId>microprofile-parent</artifactId>
-        <version>2.8</version>
+        <version>2.9-RC1</version>
     </parent>
 
     <groupId>org.eclipse.microprofile.openapi</groupId>

tck/src/main/java/org/eclipse/microprofile/openapi/apps/airlines/data/UserData.java

@@ -19,7 +19,7 @@
 import org.eclipse.microprofile.openapi.apps.airlines.model.User;
 
 public class UserData {
-    static List<User> users = new ArrayList<User>();
+    static private List<User> users = new ArrayList<User>();
 
     static {
         users.add(createUser(1, "Bob1", "pswd", "Bob", "Smith", "male", 12,

tck/src/main/java/org/eclipse/microprofile/openapi/apps/airlines/resources/AirlinesResource.java

@@ -70,7 +70,8 @@ public static Airline getRandomAirline() {
             @Extension(name = "x-boolean-property", value = "true", parseValue = true),
             @Extension(name = "x-number-property", value = "117", parseValue = true),
             @Extension(name = "x-object-property",
-                       value = "{ \"property-1\" : \"value-1\", \"property-2\" : \"value-2\", \"property-3\" : { \"prop-3-1\" : 17, \"prop-3-2\" : true } }",
+                       value = "{ \"property-1\" : \"value-1\", \"property-2\" : \"value-2\","
+                               + " \"property-3\" : { \"prop-3-1\" : 17, \"prop-3-2\" : true } }",
                        parseValue = true),
             @Extension(name = "x-string-array-property", value = "[ \"one\", \"two\", \"three\" ]", parseValue = true),
             @Extension(name = "x-object-array-property",

tck/src/main/java/org/eclipse/microprofile/openapi/apps/petstore/data/PetData.java

@@ -23,8 +23,8 @@
 import org.eclipse.microprofile.openapi.apps.petstore.model.Tag;
 
 public class PetData {
-    static List<Pet> pets = new ArrayList<Pet>();
-    static List<Category> categories = new ArrayList<Category>();
+    static private List<Pet> pets = new ArrayList<Pet>();
+    static private List<Category> categories = new ArrayList<Category>();
 
     static {
         categories.add(createCategory(1, "Dogs"));

tck/src/main/java/org/eclipse/microprofile/openapi/apps/petstore/data/StoreData.java

@@ -20,7 +20,7 @@
 import org.eclipse.microprofile.openapi.apps.petstore.model.Order;
 
 public class StoreData {
-    static List<Order> orders = new ArrayList<Order>();
+    private static List<Order> orders = new ArrayList<Order>();
 
     static {
         orders.add(createOrder(1, 1, 2, new Date(), "placed"));

tck/src/main/java/org/eclipse/microprofile/openapi/apps/petstore/data/UserData.java

@@ -19,7 +19,7 @@
 import org.eclipse.microprofile.openapi.apps.petstore.model.User;
 
 public class UserData {
-    static List<User> users = new ArrayList<User>();
+    private static List<User> users = new ArrayList<User>();
 
     static {
         users.add(createUser(1, "user1", "first name 1", "last name 1",

tck/src/main/java/org/eclipse/microprofile/openapi/apps/petstore/model/ApiResponse.java

@@ -23,9 +23,9 @@ public class ApiResponse {
     public static final int OK = 4;
     public static final int TOO_BUSY = 5;
 
-    int code;
-    String type;
-    String message;
+    private int code;
+    private String type;
+    private String message;
 
     public ApiResponse() {
     }

tck/src/main/java/org/eclipse/microprofile/openapi/apps/petstore/model/Cat.java

@@ -18,7 +18,7 @@
 @XmlRootElement(name = "Cat")
 public class Cat extends Pet {
 
-    String catBreed;
+    private String catBreed;
 
     public String getCatBreed() {
         return catBreed;

tck/src/main/java/org/eclipse/microprofile/openapi/apps/petstore/model/Dog.java

@@ -18,7 +18,7 @@
 @XmlRootElement(name = "Dog")
 public class Dog extends Pet {
 
-    String dogBreed;
+    private String dogBreed;
 
     public String getDogBreed() {
         return dogBreed;

tck/src/main/java/org/eclipse/microprofile/openapi/apps/petstore/model/Lizard.java

@@ -18,7 +18,7 @@
 @XmlRootElement(name = "Lizard")
 public class Lizard extends Pet {
 
-    String lizardBreed;
+    private String lizardBreed;
 
     public String getLizardBreed() {
         return lizardBreed;

tck/src/main/java/org/eclipse/microprofile/openapi/apps/petstore/resource/PetResource.java

@@ -77,7 +77,7 @@
 })
 public class PetResource {
 
-    static PetData petData = new PetData();
+    static private PetData petData = new PetData();
 
     @GET
     @Path("/{petId}")
@@ -168,6 +168,7 @@ public Response deletePet(
     @APIResponse(responseCode = "400", description = "Invalid input",
                  content = @Content(mediaType = "application/json",
                                     schema = @Schema(implementation = ApiResponse.class)))
+    @SuppressWarnings("checkstyle:linelength")
     @RequestBody(name = "pet",
                  content = @Content(mediaType = "application/json", schema = @Schema(implementation = Pet.class),
                                     examples = @ExampleObject(ref = "http://example.org/petapi-examples/openapi.json#/components/examples/pet-example")),
@@ -203,7 +204,8 @@ public Response updatePet(
     @Produces("application/json")
     @Callback(name = "tagsCallback", callbackUrlExpression = "http://petstoreapp.com/pet",
               operations = @CallbackOperation(method = "GET", summary = "Finds Pets by tags",
-                                              description = "Find Pets by tags; Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.",
+                                              description = "Find Pets by tags; Muliple tags can be provided with comma seperated strings. "
+                                                      + "Use tag1, tag2, tag3 for testing.",
                                               responses = {
                                                       @APIResponse(responseCode = "400",
                                                                    description = "Invalid tag value",

tck/src/main/java/org/eclipse/microprofile/openapi/apps/petstore/resource/PetStoreResource.java

@@ -59,8 +59,8 @@
 @Extension(name = "x-mp-type1", value = "true")
 @Extension(name = "x-mp-type2", value = "false")
 public class PetStoreResource {
-    static StoreData storeData = new StoreData();
-    static PetData petData = new PetData();
+    static private StoreData storeData = new StoreData();
+    static private PetData petData = new PetData();
 
     @GET
     @Path("/inventory")

tck/src/main/java/org/eclipse/microprofile/openapi/apps/petstore/resource/UserResource.java

@@ -57,7 +57,7 @@
                         scheme = "bearer", bearerFormat = "JWT")
 })
 public class UserResource {
-    static UserData userData = new UserData();
+    private static UserData userData = new UserData();
 
     @POST
     @APIResponse(description = "successful operation")

tck/src/main/java/org/eclipse/microprofile/openapi/reader/MyOASModelReaderImpl.java

@@ -57,6 +57,7 @@
 public class MyOASModelReaderImpl implements OASModelReader {
 
     @Override
+    @SuppressWarnings("checkstyle:methodlength")
     public OpenAPI buildModel() {
         return OASFactory.createObject(OpenAPI.class)
                 .info(OASFactory.createObject(Info.class)

tck/src/main/java/org/eclipse/microprofile/openapi/tck/ModelConstructionTest.java

@@ -1930,10 +1930,8 @@ private Map<String, Property> collectProperties(Class<?> clazz) {
                         p.addBuilder(m);
                     }
                 }
-            }
-            // Possible setter method
-            else if (returnType == Void.TYPE) {
-                if (name.startsWith("set") && parameterCount == 1) {
+            } else if (returnType == Void.TYPE) {
+                if (name.startsWith("set") && parameterCount == 1) { // Possible setter method
                     name = Introspector.decapitalize(name.substring(3));
                     type = m.getParameterTypes()[0];
                     p = properties.get(name);
@@ -1945,10 +1943,8 @@ else if (returnType == Void.TYPE) {
                         p.addSetter(m);
                     }
                 }
-            }
-            // Possible getter method
-            else {
-                if (name.startsWith("get") && parameterCount == 0) {
+            } else {
+                if (name.startsWith("get") && parameterCount == 0) { // Possible getter method
                     name = Introspector.decapitalize(name.substring(3));
                     type = returnType;
                     p = properties.get(name);

tck/src/main/java/org/eclipse/microprofile/openapi/tck/PetStoreAppTest.java

@@ -288,16 +288,16 @@ public void testAPIResponseSchemaDefaultResponseCode(String type) {
     public void testExtensionPlacement(String type) {
         ValidatableResponse vr = callEndpoint(type);
 
-        final String X_OPERATION_EXT = "x-operation-ext";
-        final String TEST_OPERATION_EXT = "test-operation-ext";
+        final String xOperationExt = "x-operation-ext";
+        final String testOperationExt = "test-operation-ext";
         String opPath = "paths.'/store/inventory'.get";
 
-        vr.body(opPath, hasEntry(equalTo(X_OPERATION_EXT), equalTo(TEST_OPERATION_EXT)));
+        vr.body(opPath, hasEntry(equalTo(xOperationExt), equalTo(testOperationExt)));
 
         vr.body(opPath + ".responses", hasEntry(equalTo("x-responses-ext"), equalTo("test-responses-ext")));
-        vr.body(opPath + ".responses.'200'", not(hasKey(X_OPERATION_EXT)));
+        vr.body(opPath + ".responses.'200'", not(hasKey(xOperationExt)));
         vr.body(opPath + ".responses.'200'", hasEntry(equalTo("x-response-ext"), equalTo("test-response-ext")));
-        vr.body(opPath + ".responses.'500'", not(hasKey(X_OPERATION_EXT)));
+        vr.body(opPath + ".responses.'500'", not(hasKey(xOperationExt)));
         vr.body(opPath + ".responses.'503'.content.'application/json'",
                 hasEntry(equalTo("x-notavailable-ext"), equalTo("true")));
         vr.body(opPath + ".responses.'503'.content.'application/xml'",