From 47b0a917a24ce0b27e83193670edc70823ec5e73 Mon Sep 17 00:00:00 2001
From: Roland Praml
Date: Wed, 4 Oct 2017 23:55:48 +0200
Subject: [PATCH] No effective code change - fix imports and override
annotations (#1155)
---
src/main/java/io/ebean/RawSql.java | 11 ----------
.../io/ebeaninternal/json/DJsonService.java | 20 +++++++++++++++++++
.../server/deploy/BeanPropertyAssocMany.java | 1 +
.../persist/dmlbind/FactoryProperty.java | 1 -
.../server/text/json/WriteJson.java | 10 ++++++++++
.../update/TestUpdateAllLoadedProperties.java | 1 -
6 files changed, 31 insertions(+), 13 deletions(-)
diff --git a/src/main/java/io/ebean/RawSql.java b/src/main/java/io/ebean/RawSql.java
index 0c52bb83e..857ce7328 100644
--- a/src/main/java/io/ebean/RawSql.java
+++ b/src/main/java/io/ebean/RawSql.java
@@ -1,16 +1,5 @@
package io.ebean;
-import io.ebean.util.CamelCaseHelper;
-
-import java.io.Serializable;
-import java.sql.ResultSet;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
/**
* Used to build object graphs based on a raw SQL statement (rather than
* generated by Ebean).
diff --git a/src/main/java/io/ebeaninternal/json/DJsonService.java b/src/main/java/io/ebeaninternal/json/DJsonService.java
index 8310041b0..0b4dc7412 100644
--- a/src/main/java/io/ebeaninternal/json/DJsonService.java
+++ b/src/main/java/io/ebeaninternal/json/DJsonService.java
@@ -22,6 +22,7 @@ public class DJsonService implements SpiJsonService {
/**
* Write the nested Map/List as json.
*/
+ @Override
public String write(Object object) throws IOException {
return EJsonWriter.write(object);
}
@@ -29,6 +30,7 @@ public class DJsonService implements SpiJsonService {
/**
* Write the nested Map/List as json to the writer.
*/
+ @Override
public void write(Object object, Writer writer) throws IOException {
EJsonWriter.write(object, writer);
}
@@ -36,6 +38,7 @@ public class DJsonService implements SpiJsonService {
/**
* Write the nested Map/List as json to the jsonGenerator.
*/
+ @Override
public void write(Object object, JsonGenerator jsonGenerator) throws IOException {
EJsonWriter.write(object, jsonGenerator);
}
@@ -43,6 +46,7 @@ public class DJsonService implements SpiJsonService {
/**
* Write the collection as json array to the jsonGenerator.
*/
+ @Override
public void writeCollection(Collection
*/
+ @Override
public Map parseObject(JsonParser parser, JsonToken token) throws IOException {
return EJsonReader.parseObject(parser, token);
}
@@ -96,6 +106,7 @@ public class DJsonService implements SpiJsonService {
/**
* Parse the json and return as a modify aware List.
*/
+ @Override
public List parseList(String json, boolean modifyAware) throws IOException {
return EJsonReader.parseList(json, modifyAware);
}
@@ -103,6 +114,7 @@ public class DJsonService implements SpiJsonService {
/**
* Parse the json and return as a List.
*/
+ @Override
public List