From 83eccb915626f6626ba753ade247bcbf8f7777d2 Mon Sep 17 00:00:00 2001
From: Koke Laast <koke24@yahoo.com>
Date: Wed, 15 Mar 2017 12:39:35 +0100
Subject: [PATCH] When attributes are set, exclude everything else: not only
 *.class

---
 .../java/org/springframework/roo/addon/json/JsonMetadata.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon-json/src/main/java/org/springframework/roo/addon/json/JsonMetadata.java b/addon-json/src/main/java/org/springframework/roo/addon/json/JsonMetadata.java
index 59063d7b42..19cd6d02ab 100644
--- a/addon-json/src/main/java/org/springframework/roo/addon/json/JsonMetadata.java
+++ b/addon-json/src/main/java/org/springframework/roo/addon/json/JsonMetadata.java
@@ -255,7 +255,7 @@ private MethodMetadataBuilder getToJsonArrayMethod(boolean includeParams) {
         bodyBuilder
                     .appendFormalLine(
                         (!includeParams ? "" : ".include(fields)")
-                        + ".exclude(\"*.class\")"
+                        + (!includeParams ? ".exclude(\"*.class\")": ".exclude(\"*\")")
                         + (annotationValues.isDeepSerialize() ? ".deepSerialize(collection)"
                                 : ".serialize(collection)") + ";");
 
@@ -306,7 +306,7 @@ private MethodMetadataBuilder getToJsonMethod(boolean includeParams) {
         }
         bodyBuilder.appendFormalLine(
                 (!includeParams ? "" : ".include(fields)")
-                + ".exclude(\"*.class\")"
+                + (!includeParams ? ".exclude(\"*.class\")": ".exclude(\"*\")")
                 + (annotationValues.isDeepSerialize() ? ".deepSerialize(this)"
                         : ".serialize(this)") + ";");