From 2dceccfa78ba8125bfe4e3fe671690e3fa88df02 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 17 Nov 2016 19:22:58 +1300 Subject: [PATCH] no effective change - format only --- .../server/autotune/model/Autotune.java | 203 +++++++--------- .../server/autotune/model/ObjectFactory.java | 98 ++++---- .../server/autotune/model/Origin.java | 227 ++++++++---------- .../server/autotune/model/ProfileDiff.java | 67 +++--- .../server/autotune/model/ProfileEmpty.java | 67 +++--- .../server/autotune/model/ProfileNew.java | 67 +++--- .../service/AutoTuneAllCollection.java | 4 +- .../autotune/service/AutoTuneXmlWriter.java | 2 +- .../service/DefaultAutoTuneService.java | 2 +- .../autotune/service/ProfileOriginQuery.java | 4 +- .../server/cache/CacheChangeSet.java | 4 +- .../server/cache/CachedBeanData.java | 2 +- .../server/cache/CachedBeanDataFromBean.java | 2 +- .../server/cache/DefaultCacheHolder.java | 2 +- .../server/cache/DefaultServerCache.java | 3 +- .../changelog/DefaultChangeLogListener.java | 2 +- .../server/cluster/ClusterManager.java | 2 +- 17 files changed, 347 insertions(+), 411 deletions(-) diff --git a/src/main/java/com/avaje/ebeaninternal/server/autotune/model/Autotune.java b/src/main/java/com/avaje/ebeaninternal/server/autotune/model/Autotune.java index 6de29008b..c9c67c248 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autotune/model/Autotune.java +++ b/src/main/java/com/avaje/ebeaninternal/server/autotune/model/Autotune.java @@ -1,19 +1,18 @@ - package com.avaje.ebeaninternal.server.autotune.model; -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.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import java.util.ArrayList; +import java.util.List; /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * + * Java class for anonymous complex type. + *

+ * The following schema fragment specifies the expected content contained within this class. + *

* 

  * <complexType>
  *   <complexContent>
@@ -28,123 +27,107 @@ import javax.xml.bind.annotation.XmlType;
  *   </complexContent>
  * </complexType>
  *
- * - * */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = { - "origin", - "profileDiff", - "profileNew", - "profileEmpty" + "origin", + "profileDiff", + "profileNew", + "profileEmpty" }) @XmlRootElement(name = "autotune") public class Autotune { - protected List origin; - protected ProfileDiff profileDiff; - protected ProfileNew profileNew; - protected ProfileEmpty profileEmpty; + protected List origin; + protected ProfileDiff profileDiff; + protected ProfileNew profileNew; + protected ProfileEmpty profileEmpty; - /** - * Gets the value of the origin property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the origin property. - * - *

- * For example, to add a new item, do as follows: - * 

-     *    getOrigin().add(newItem);
-     *
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Origin } - * - * - */ - public List getOrigin() { - if (origin == null) { - origin = new ArrayList<>(); - } - return this.origin; + /** + * Gets the value of the origin property. + *

+ *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the origin property. + *

+ *

+ * For example, to add a new item, do as follows: + * 

+   *    getOrigin().add(newItem);
+   *
+ *

+ *

+ *

+ * Objects of the following type(s) are allowed in the list + * {@link Origin } + */ + public List getOrigin() { + if (origin == null) { + origin = new ArrayList<>(); } + return this.origin; + } - /** - * Gets the value of the profileDiff property. - * - * @return - * possible object is - * {@link ProfileDiff } - * - */ - public ProfileDiff getProfileDiff() { - return profileDiff; - } + /** + * Gets the value of the profileDiff property. + * + * @return possible object is + * {@link ProfileDiff } + */ + public ProfileDiff getProfileDiff() { + return profileDiff; + } - /** - * Sets the value of the profileDiff property. - * - * @param value - * allowed object is - * {@link ProfileDiff } - * - */ - public void setProfileDiff(ProfileDiff value) { - this.profileDiff = value; - } + /** + * Sets the value of the profileDiff property. + * + * @param value allowed object is + * {@link ProfileDiff } + */ + public void setProfileDiff(ProfileDiff value) { + this.profileDiff = value; + } - /** - * Gets the value of the profileNew property. - * - * @return - * possible object is - * {@link ProfileNew } - * - */ - public ProfileNew getProfileNew() { - return profileNew; - } + /** + * Gets the value of the profileNew property. + * + * @return possible object is + * {@link ProfileNew } + */ + public ProfileNew getProfileNew() { + return profileNew; + } - /** - * Sets the value of the profileNew property. - * - * @param value - * allowed object is - * {@link ProfileNew } - * - */ - public void setProfileNew(ProfileNew value) { - this.profileNew = value; - } + /** + * Sets the value of the profileNew property. + * + * @param value allowed object is + * {@link ProfileNew } + */ + public void setProfileNew(ProfileNew value) { + this.profileNew = value; + } - /** - * Gets the value of the profileEmpty property. - * - * @return - * possible object is - * {@link ProfileEmpty } - * - */ - public ProfileEmpty getProfileEmpty() { - return profileEmpty; - } + /** + * Gets the value of the profileEmpty property. + * + * @return possible object is + * {@link ProfileEmpty } + */ + public ProfileEmpty getProfileEmpty() { + return profileEmpty; + } - /** - * Sets the value of the profileEmpty property. - * - * @param value - * allowed object is - * {@link ProfileEmpty } - * - */ - public void setProfileEmpty(ProfileEmpty value) { - this.profileEmpty = value; - } + /** + * Sets the value of the profileEmpty property. + * + * @param value allowed object is + * {@link ProfileEmpty } + */ + public void setProfileEmpty(ProfileEmpty value) { + this.profileEmpty = value; + } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/autotune/model/ObjectFactory.java b/src/main/java/com/avaje/ebeaninternal/server/autotune/model/ObjectFactory.java index effa06fff..26e70bd70 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autotune/model/ObjectFactory.java +++ b/src/main/java/com/avaje/ebeaninternal/server/autotune/model/ObjectFactory.java @@ -1,72 +1,64 @@ - package com.avaje.ebeaninternal.server.autotune.model; import javax.xml.bind.annotation.XmlRegistry; /** - * This object contains factory methods for each - * Java content interface and Java element interface - * generated in the com.avaje.ebeaninternal.server.autotune.model package. - *

An ObjectFactory allows you to programatically - * construct new instances of the Java representation - * for XML content. The Java representation of XML - * content can consist of schema derived interfaces - * and classes representing the binding of schema - * type definitions, element declarations and model - * groups. Factory methods for each of these are + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the com.avaje.ebeaninternal.server.autotune.model package. + *

An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are * provided in this class. - * */ @XmlRegistry public class ObjectFactory { - /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.avaje.ebeaninternal.server.autotune.model - * - */ - public ObjectFactory() { - } + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.avaje.ebeaninternal.server.autotune.model + */ + public ObjectFactory() { + } - /** - * Create an instance of {@link ProfileNew } - * - */ - public ProfileNew createProfileNew() { - return new ProfileNew(); - } + /** + * Create an instance of {@link ProfileNew } + */ + public ProfileNew createProfileNew() { + return new ProfileNew(); + } - /** - * Create an instance of {@link Origin } - * - */ - public Origin createOrigin() { - return new Origin(); - } + /** + * Create an instance of {@link Origin } + */ + public Origin createOrigin() { + return new Origin(); + } - /** - * Create an instance of {@link ProfileEmpty } - * - */ - public ProfileEmpty createProfileEmpty() { - return new ProfileEmpty(); - } + /** + * Create an instance of {@link ProfileEmpty } + */ + public ProfileEmpty createProfileEmpty() { + return new ProfileEmpty(); + } - /** - * Create an instance of {@link Autotune } - * - */ - public Autotune createAutotune() { - return new Autotune(); - } + /** + * Create an instance of {@link Autotune } + */ + public Autotune createAutotune() { + return new Autotune(); + } - /** - * Create an instance of {@link ProfileDiff } - * - */ - public ProfileDiff createProfileDiff() { - return new ProfileDiff(); - } + /** + * Create an instance of {@link ProfileDiff } + */ + public ProfileDiff createProfileDiff() { + return new ProfileDiff(); + } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/autotune/model/Origin.java b/src/main/java/com/avaje/ebeaninternal/server/autotune/model/Origin.java index 04c9af034..150197c3b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autotune/model/Origin.java +++ b/src/main/java/com/avaje/ebeaninternal/server/autotune/model/Origin.java @@ -1,4 +1,3 @@ - package com.avaje.ebeaninternal.server.autotune.model; import javax.xml.bind.annotation.XmlAccessType; @@ -10,9 +9,9 @@ import javax.xml.bind.annotation.XmlType; /** *

Java class for anonymous complex type. - * + *

*

The following schema fragment specifies the expected content contained within this class. - * + *

* 

  * <complexType>
  *   <complexContent>
@@ -28,144 +27,122 @@ import javax.xml.bind.annotation.XmlType;
  *   </complexContent>
  * </complexType>
  *
- * - * */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = { - "callStack" + "callStack" }) @XmlRootElement(name = "origin") public class Origin { - protected String callStack; - @XmlAttribute(name = "key", required = true) - protected String key; - @XmlAttribute(name = "beanType") - protected String beanType; - @XmlAttribute(name = "detail") - protected String detail; - @XmlAttribute(name = "original") - protected String original; + protected String callStack; + @XmlAttribute(name = "key", required = true) + protected String key; + @XmlAttribute(name = "beanType") + protected String beanType; + @XmlAttribute(name = "detail") + protected String detail; + @XmlAttribute(name = "original") + protected String original; - /** - * Gets the value of the callStack property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCallStack() { - return callStack; - } + /** + * Gets the value of the callStack property. + * + * @return possible object is + * {@link String } + */ + public String getCallStack() { + return callStack; + } - /** - * Sets the value of the callStack property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCallStack(String value) { - this.callStack = value; - } + /** + * Sets the value of the callStack property. + * + * @param value allowed object is + * {@link String } + */ + public void setCallStack(String value) { + this.callStack = value; + } - /** - * Gets the value of the key property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getKey() { - return key; - } + /** + * Gets the value of the key property. + * + * @return possible object is + * {@link String } + */ + public String getKey() { + return key; + } - /** - * Sets the value of the key property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setKey(String value) { - this.key = value; - } + /** + * Sets the value of the key property. + * + * @param value allowed object is + * {@link String } + */ + public void setKey(String value) { + this.key = value; + } - /** - * Gets the value of the beanType property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getBeanType() { - return beanType; - } + /** + * Gets the value of the beanType property. + * + * @return possible object is + * {@link String } + */ + public String getBeanType() { + return beanType; + } - /** - * Sets the value of the beanType property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setBeanType(String value) { - this.beanType = value; - } + /** + * Sets the value of the beanType property. + * + * @param value allowed object is + * {@link String } + */ + public void setBeanType(String value) { + this.beanType = value; + } - /** - * Gets the value of the detail property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getDetail() { - return detail; - } + /** + * Gets the value of the detail property. + * + * @return possible object is + * {@link String } + */ + public String getDetail() { + return detail; + } - /** - * Sets the value of the detail property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setDetail(String value) { - this.detail = value; - } + /** + * Sets the value of the detail property. + * + * @param value allowed object is + * {@link String } + */ + public void setDetail(String value) { + this.detail = value; + } - /** - * Gets the value of the original property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getOriginal() { - return original; - } + /** + * Gets the value of the original property. + * + * @return possible object is + * {@link String } + */ + public String getOriginal() { + return original; + } - /** - * Sets the value of the original property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setOriginal(String value) { - this.original = value; - } + /** + * Sets the value of the original property. + * + * @param value allowed object is + * {@link String } + */ + public void setOriginal(String value) { + this.original = value; + } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/autotune/model/ProfileDiff.java b/src/main/java/com/avaje/ebeaninternal/server/autotune/model/ProfileDiff.java index c8357a41e..5fc587ef0 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autotune/model/ProfileDiff.java +++ b/src/main/java/com/avaje/ebeaninternal/server/autotune/model/ProfileDiff.java @@ -1,19 +1,18 @@ - package com.avaje.ebeaninternal.server.autotune.model; -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.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import java.util.ArrayList; +import java.util.List; /** *

Java class for anonymous complex type. - * + *

*

The following schema fragment specifies the expected content contained within this class. - * + *

* 

  * <complexType>
  *   <complexContent>
@@ -25,45 +24,41 @@ import javax.xml.bind.annotation.XmlType;
  *   </complexContent>
  * </complexType>
  *
- * - * */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = { - "origin" + "origin" }) @XmlRootElement(name = "profileDiff") public class ProfileDiff { - protected List origin; + protected List origin; - /** - * Gets the value of the origin property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the origin property. - * - *

- * For example, to add a new item, do as follows: - * 

-     *    getOrigin().add(newItem);
-     *
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Origin } - * - * - */ - public List getOrigin() { - if (origin == null) { - origin = new ArrayList<>(); - } - return this.origin; + /** + * Gets the value of the origin property. + *

+ *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the origin property. + *

+ *

+ * For example, to add a new item, do as follows: + * 

+   *    getOrigin().add(newItem);
+   *
+ *

+ *

+ *

+ * Objects of the following type(s) are allowed in the list + * {@link Origin } + */ + public List getOrigin() { + if (origin == null) { + origin = new ArrayList<>(); } + return this.origin; + } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/autotune/model/ProfileEmpty.java b/src/main/java/com/avaje/ebeaninternal/server/autotune/model/ProfileEmpty.java index 317d7d431..1a962316c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autotune/model/ProfileEmpty.java +++ b/src/main/java/com/avaje/ebeaninternal/server/autotune/model/ProfileEmpty.java @@ -1,19 +1,18 @@ - package com.avaje.ebeaninternal.server.autotune.model; -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.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import java.util.ArrayList; +import java.util.List; /** *

Java class for anonymous complex type. - * + *

*

The following schema fragment specifies the expected content contained within this class. - * + *

* 

  * <complexType>
  *   <complexContent>
@@ -25,45 +24,41 @@ import javax.xml.bind.annotation.XmlType;
  *   </complexContent>
  * </complexType>
  *
- * - * */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = { - "origin" + "origin" }) @XmlRootElement(name = "profileEmpty") public class ProfileEmpty { - protected List origin; + protected List origin; - /** - * Gets the value of the origin property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the origin property. - * - *

- * For example, to add a new item, do as follows: - * 

-     *    getOrigin().add(newItem);
-     *
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Origin } - * - * - */ - public List getOrigin() { - if (origin == null) { - origin = new ArrayList<>(); - } - return this.origin; + /** + * Gets the value of the origin property. + *

+ *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the origin property. + *

+ *

+ * For example, to add a new item, do as follows: + * 

+   *    getOrigin().add(newItem);
+   *
+ *

+ *

+ *

+ * Objects of the following type(s) are allowed in the list + * {@link Origin } + */ + public List getOrigin() { + if (origin == null) { + origin = new ArrayList<>(); } + return this.origin; + } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/autotune/model/ProfileNew.java b/src/main/java/com/avaje/ebeaninternal/server/autotune/model/ProfileNew.java index 416b3e8c4..03f208d6b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autotune/model/ProfileNew.java +++ b/src/main/java/com/avaje/ebeaninternal/server/autotune/model/ProfileNew.java @@ -1,19 +1,18 @@ - package com.avaje.ebeaninternal.server.autotune.model; -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.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import java.util.ArrayList; +import java.util.List; /** *

Java class for anonymous complex type. - * + *

*

The following schema fragment specifies the expected content contained within this class. - * + *

* 

  * <complexType>
  *   <complexContent>
@@ -25,45 +24,41 @@ import javax.xml.bind.annotation.XmlType;
  *   </complexContent>
  * </complexType>
  *
- * - * */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = { - "origin" + "origin" }) @XmlRootElement(name = "profileNew") public class ProfileNew { - protected List origin; + protected List origin; - /** - * Gets the value of the origin property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the origin property. - * - *

- * For example, to add a new item, do as follows: - * 

-     *    getOrigin().add(newItem);
-     *
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Origin } - * - * - */ - public List getOrigin() { - if (origin == null) { - origin = new ArrayList<>(); - } - return this.origin; + /** + * Gets the value of the origin property. + *

+ *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the origin property. + *

+ *

+ * For example, to add a new item, do as follows: + * 

+   *    getOrigin().add(newItem);
+   *
+ *

+ *

+ *

+ * Objects of the following type(s) are allowed in the list + * {@link Origin } + */ + public List getOrigin() { + if (origin == null) { + origin = new ArrayList<>(); } + return this.origin; + } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/autotune/service/AutoTuneAllCollection.java b/src/main/java/com/avaje/ebeaninternal/server/autotune/service/AutoTuneAllCollection.java index 6956f60ab..5f2068842 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autotune/service/AutoTuneAllCollection.java +++ b/src/main/java/com/avaje/ebeaninternal/server/autotune/service/AutoTuneAllCollection.java @@ -7,7 +7,7 @@ import java.util.Collection; /** * Event where all tuned query information is collected. *

- * This is for writing the "all" file on shutdown when using runtime tuning. + * This is for writing the "all" file on shutdown when using runtime tuning. *

*/ public class AutoTuneAllCollection { @@ -53,7 +53,7 @@ public class AutoTuneAllCollection { private void loadAllTuned() { Collection all = queryTuner.getAll(); - for (TunedQueryInfo tuned: all) { + for (TunedQueryInfo tuned : all) { document.getOrigin().add(tuned.getOrigin()); } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/autotune/service/AutoTuneXmlWriter.java b/src/main/java/com/avaje/ebeaninternal/server/autotune/service/AutoTuneXmlWriter.java index a86f9f7ab..552eb9123 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autotune/service/AutoTuneXmlWriter.java +++ b/src/main/java/com/avaje/ebeaninternal/server/autotune/service/AutoTuneXmlWriter.java @@ -46,7 +46,7 @@ public class AutoTuneXmlWriter { try { JAXBContext jaxbContext = JAXBContext.newInstance(Autotune.class); Marshaller marshaller = jaxbContext.createMarshaller(); - marshaller.setProperty( Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE); + marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE); marshaller.marshal(profiling, file); } catch (JAXBException e) { diff --git a/src/main/java/com/avaje/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java b/src/main/java/com/avaje/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java index da8ebf80c..c3ae7f756 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java +++ b/src/main/java/com/avaje/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java @@ -196,7 +196,7 @@ public class DefaultAutoTuneService implements AutoTuneService { File existingTuning = new File(tuningFile); if (existingTuning.exists()) { // rename the existing autotune.xml file (appending 'now') - if (!existingTuning.renameTo(new File(tuningFile+"."+AutoTuneXmlWriter.now()))) { + if (!existingTuning.renameTo(new File(tuningFile + "." + AutoTuneXmlWriter.now()))) { logger.warn("Failed to rename autotune file [{}]", tuningFile); } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/autotune/service/ProfileOriginQuery.java b/src/main/java/com/avaje/ebeaninternal/server/autotune/service/ProfileOriginQuery.java index b0a938393..d7f298152 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autotune/service/ProfileOriginQuery.java +++ b/src/main/java/com/avaje/ebeaninternal/server/autotune/service/ProfileOriginQuery.java @@ -30,7 +30,7 @@ public class ProfileOriginQuery implements Serializable { totalMicros.add(micros); } - public AutoTuneCollection.EntryQuery createEntryQuery(boolean reset){ + public AutoTuneCollection.EntryQuery createEntryQuery(boolean reset) { if (reset) { return new AutoTuneCollection.EntryQuery(path, exeCount.sumThenReset(), totalBeanLoaded.sumThenReset(), totalMicros.sumThenReset()); @@ -40,4 +40,4 @@ public class ProfileOriginQuery implements Serializable { } } -} \ No newline at end of file +} diff --git a/src/main/java/com/avaje/ebeaninternal/server/cache/CacheChangeSet.java b/src/main/java/com/avaje/ebeaninternal/server/cache/CacheChangeSet.java index 50fb06f46..282c9c8d7 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/cache/CacheChangeSet.java +++ b/src/main/java/com/avaje/ebeaninternal/server/cache/CacheChangeSet.java @@ -37,7 +37,7 @@ public class CacheChangeSet { /** * Apply the changes to the L2 cache except entity/view invalidation. - * + *

* Return the set of table changes to process invalidation for entities based on views. */ public Set apply() { @@ -139,7 +139,7 @@ public class CacheChangeSet { final List removes = new ArrayList<>(); - final Map puts = new LinkedHashMap<>(); + final Map puts = new LinkedHashMap<>(); boolean clear; diff --git a/src/main/java/com/avaje/ebeaninternal/server/cache/CachedBeanData.java b/src/main/java/com/avaje/ebeaninternal/server/cache/CachedBeanData.java index b82a4c361..526d56f24 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/cache/CachedBeanData.java +++ b/src/main/java/com/avaje/ebeaninternal/server/cache/CachedBeanData.java @@ -133,7 +133,7 @@ public class CachedBeanData implements Externalizable { /** * Return all the property data. */ - public Map getData() { + public Map getData() { return data; } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/cache/CachedBeanDataFromBean.java b/src/main/java/com/avaje/ebeaninternal/server/cache/CachedBeanDataFromBean.java index 7927f20bd..3f2dc99bb 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/cache/CachedBeanDataFromBean.java +++ b/src/main/java/com/avaje/ebeaninternal/server/cache/CachedBeanDataFromBean.java @@ -15,7 +15,7 @@ public class CachedBeanDataFromBean { EntityBeanIntercept ebi = bean._ebean_getIntercept(); - Map data = new LinkedHashMap<>(); + Map data = new LinkedHashMap<>(); BeanProperty idProperty = desc.getIdProperty(); if (idProperty != null) { diff --git a/src/main/java/com/avaje/ebeaninternal/server/cache/DefaultCacheHolder.java b/src/main/java/com/avaje/ebeaninternal/server/cache/DefaultCacheHolder.java index 82c58da0b..cae96c6a5 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/cache/DefaultCacheHolder.java +++ b/src/main/java/com/avaje/ebeaninternal/server/cache/DefaultCacheHolder.java @@ -1,7 +1,7 @@ package com.avaje.ebeaninternal.server.cache; -import com.avaje.ebean.annotation.CacheQueryTuning; import com.avaje.ebean.annotation.CacheBeanTuning; +import com.avaje.ebean.annotation.CacheQueryTuning; import com.avaje.ebean.cache.ServerCache; import com.avaje.ebean.cache.ServerCacheFactory; import com.avaje.ebean.cache.ServerCacheOptions; diff --git a/src/main/java/com/avaje/ebeaninternal/server/cache/DefaultServerCache.java b/src/main/java/com/avaje/ebeaninternal/server/cache/DefaultServerCache.java index da247e70c..0204c677e 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/cache/DefaultServerCache.java +++ b/src/main/java/com/avaje/ebeaninternal/server/cache/DefaultServerCache.java @@ -4,7 +4,6 @@ import com.avaje.ebean.BackgroundExecutor; import com.avaje.ebean.cache.ServerCache; import com.avaje.ebean.cache.ServerCacheOptions; import com.avaje.ebean.cache.ServerCacheStatistics; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -323,7 +322,7 @@ public class DefaultServerCache implements ServerCache { if (logger.isTraceEnabled()) { logger.trace("Executed trim of cache {} in [{}]millis idle[{}] timeToLive[{}] accessTime[{}]" - , name, exeMicros, trimmedByIdle, trimmedByTTL, trimmedByLRU); + , name, exeMicros, trimmedByIdle, trimmedByTTL, trimmedByLRU); } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/changelog/DefaultChangeLogListener.java b/src/main/java/com/avaje/ebeaninternal/server/changelog/DefaultChangeLogListener.java index 1e00c9564..3d6c0bb31 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/changelog/DefaultChangeLogListener.java +++ b/src/main/java/com/avaje/ebeaninternal/server/changelog/DefaultChangeLogListener.java @@ -4,8 +4,8 @@ import com.avaje.ebean.event.changelog.BeanChange; import com.avaje.ebean.event.changelog.ChangeLogListener; import com.avaje.ebean.event.changelog.ChangeSet; import com.avaje.ebean.event.changelog.ChangeType; -import com.avaje.ebean.plugin.SpiServer; import com.avaje.ebean.plugin.Plugin; +import com.avaje.ebean.plugin.SpiServer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/server/cluster/ClusterManager.java b/src/main/java/com/avaje/ebeaninternal/server/cluster/ClusterManager.java index f339968da..90f848946 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/cluster/ClusterManager.java +++ b/src/main/java/com/avaje/ebeaninternal/server/cluster/ClusterManager.java @@ -49,7 +49,7 @@ public class ClusterManager { } if (factory == null) { throw new IllegalStateException("No ClusterTransportFactory found in classpath. " - + " Probably need to add the avaje-ebeanorm-cluster dependency"); + + " Probably need to add the avaje-ebeanorm-cluster dependency"); } return factory; }