fix formatting

kiegroup · Jul 16, 2024 · 446ac56 · 446ac56
1 parent b385299
commit 446ac56
Show file tree

Hide file tree

Showing 5 changed files with 65 additions and 19 deletions.
diff --git a/...rent/kie-server-api/src/main/java/org/kie/server/api/marshalling/json/JSONMarshaller.java b/...rent/kie-server-api/src/main/java/org/kie/server/api/marshalling/json/JSONMarshaller.java
@@ -45,20 +45,6 @@
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters;
 
-import org.drools.core.xml.jaxb.util.JaxbListAdapter;
-import org.drools.core.xml.jaxb.util.JaxbListWrapper;
-import org.drools.core.xml.jaxb.util.JaxbUnknownAdapter;
-import org.kie.server.api.KieServerConstants;
-import org.kie.server.api.marshalling.Marshaller;
-import org.kie.server.api.marshalling.MarshallingException;
-import org.kie.server.api.marshalling.MarshallingFormat;
-import org.kie.server.api.marshalling.ModelWrapper;
-import org.kie.server.api.model.Wrapped;
-import org.kie.server.api.model.definition.QueryParam;
-import org.kie.server.api.model.type.JaxbByteArray;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.core.JsonGenerator;
@@ -96,6 +82,19 @@
 import com.fasterxml.jackson.databind.util.ClassUtil;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector;
+import org.drools.core.xml.jaxb.util.JaxbListAdapter;
+import org.drools.core.xml.jaxb.util.JaxbListWrapper;
+import org.drools.core.xml.jaxb.util.JaxbUnknownAdapter;
+import org.kie.server.api.KieServerConstants;
+import org.kie.server.api.marshalling.Marshaller;
+import org.kie.server.api.marshalling.MarshallingException;
+import org.kie.server.api.marshalling.MarshallingFormat;
+import org.kie.server.api.marshalling.ModelWrapper;
+import org.kie.server.api.model.Wrapped;
+import org.kie.server.api.model.definition.QueryParam;
+import org.kie.server.api.model.type.JaxbByteArray;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class JSONMarshaller implements Marshaller {
 
@@ -520,8 +519,9 @@ public List<NamedType> findSubtypes(Annotated a) {
                         continue;
                     }
                     String name = elem.name();
-                    if (MARKER_FOR_DEFAULT.equals(name))
+                    if (MARKER_FOR_DEFAULT.equals(name)) {
                         name = null;
+                    }   
                     complete.add(new NamedType(elem.type(), name));
                 }
             } else {

diff --git a/...er-api/src/test/java/org/kie/server/api/marshalling/json/JSONMarshallerExtensionTest.java b/...er-api/src/test/java/org/kie/server/api/marshalling/json/JSONMarshallerExtensionTest.java
@@ -18,7 +18,6 @@
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.Serializable;
 import java.net.URL;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -27,6 +26,8 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.assertj.core.api.Assertions;
 import org.drools.core.command.runtime.BatchExecutionCommandImpl;
 import org.drools.core.command.runtime.rule.InsertObjectCommand;
@@ -43,9 +44,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 

diff --git a/...kie-server-api/src/test/java/org/kie/server/api/marshalling/objects/FreeFormItemType.java b/...kie-server-api/src/test/java/org/kie/server/api/marshalling/objects/FreeFormItemType.java
@@ -1,6 +1,22 @@
+/*
+ * Copyright 2024 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.kie.server.api.marshalling.objects;
 
 import java.io.Serializable;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;

diff --git a/...parent/kie-server-api/src/test/java/org/kie/server/api/marshalling/objects/ItemsType.java b/...parent/kie-server-api/src/test/java/org/kie/server/api/marshalling/objects/ItemsType.java
@@ -1,8 +1,24 @@
+/*
+ * Copyright 2024 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.kie.server.api.marshalling.objects;
 
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;

diff --git a/...kie-server-api/src/test/java/org/kie/server/api/marshalling/objects/StandardItemType.java b/...kie-server-api/src/test/java/org/kie/server/api/marshalling/objects/StandardItemType.java
@@ -1,6 +1,22 @@
+/*
+ * Copyright 2024 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.kie.server.api.marshalling.objects;
 
 import java.io.Serializable;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlType;