Organized imports

fuinorg · Feb 4, 2024 · 7980377 · 7980377
1 parent 9f028f6
commit 7980377
Show file tree

Hide file tree

Showing 66 changed files with 107 additions and 93 deletions.
diff --git a/core/src/main/java/org/fuin/objects4j/core/CurrencyAmount.java b/core/src/main/java/org/fuin/objects4j/core/CurrencyAmount.java
@@ -23,10 +23,10 @@
 import org.fuin.objects4j.common.Contract;
 import org.fuin.objects4j.common.HasPublicStaticIsValidMethod;
 import org.fuin.objects4j.common.HasPublicStaticValueOfMethod;
-import javax.annotation.concurrent.Immutable;
 import org.fuin.objects4j.ui.Label;
 import org.fuin.objects4j.ui.ShortLabel;
 
+import javax.annotation.concurrent.Immutable;
 import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -37,7 +37,6 @@
  * Amount of a currency.
  */
 @Immutable
-// TODO Replace @Embeddable with XML????
 @ShortLabel("Amount")
 @Label("Amount of currency")
 @HasPublicStaticIsValidMethod

diff --git a/core/src/main/java/org/fuin/objects4j/core/DayOfTheWeek.java b/core/src/main/java/org/fuin/objects4j/core/DayOfTheWeek.java
@@ -17,19 +17,19 @@
  */
 package org.fuin.objects4j.core;
 
+import jakarta.annotation.Nullable;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import org.fuin.objects4j.common.ConstraintViolationException;
 import org.fuin.objects4j.common.Contract;
 import org.fuin.objects4j.common.HasPublicStaticIsValidMethod;
 import org.fuin.objects4j.common.HasPublicStaticValueOfMethod;
-import javax.annotation.concurrent.Immutable;
-import jakarta.annotation.Nullable;
 import org.fuin.objects4j.ui.Label;
 import org.fuin.objects4j.ui.Prompt;
 import org.fuin.objects4j.ui.ShortLabel;
 import org.fuin.objects4j.ui.Tooltip;
 
+import javax.annotation.concurrent.Immutable;
 import java.io.Serial;
 import java.io.Serializable;
 import java.time.DayOfWeek;

diff --git a/core/src/main/java/org/fuin/objects4j/core/DayOpeningHours.java b/core/src/main/java/org/fuin/objects4j/core/DayOpeningHours.java
@@ -17,17 +17,17 @@
  */
 package org.fuin.objects4j.core;
 
+import jakarta.annotation.Nullable;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import org.fuin.objects4j.common.ConstraintViolationException;
 import org.fuin.objects4j.common.Contract;
 import org.fuin.objects4j.common.HasPublicStaticIsValidMethod;
 import org.fuin.objects4j.common.HasPublicStaticValueOfMethod;
-import javax.annotation.concurrent.Immutable;
-import jakarta.annotation.Nullable;
 import org.fuin.objects4j.core.HourRanges.ChangeType;
 import org.fuin.objects4j.ui.Prompt;
 
+import javax.annotation.concurrent.Immutable;
 import java.io.Serial;
 import java.io.Serializable;
 import java.util.ArrayList;

diff --git a/core/src/main/java/org/fuin/objects4j/core/EmailAddress.java b/core/src/main/java/org/fuin/objects4j/core/EmailAddress.java
@@ -25,11 +25,11 @@
 import org.fuin.objects4j.common.Contract;
 import org.fuin.objects4j.common.HasPublicStaticIsValidMethod;
 import org.fuin.objects4j.common.HasPublicStaticValueOfMethod;
-import javax.annotation.concurrent.Immutable;
 import org.fuin.objects4j.ui.Label;
 import org.fuin.objects4j.ui.ShortLabel;
 import org.fuin.objects4j.ui.Tooltip;
 
+import javax.annotation.concurrent.Immutable;
 import java.io.Serial;
 
 /**

diff --git a/core/src/main/java/org/fuin/objects4j/core/Hour.java b/core/src/main/java/org/fuin/objects4j/core/Hour.java
@@ -17,19 +17,19 @@
  */
 package org.fuin.objects4j.core;
 
+import jakarta.annotation.Nullable;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import org.fuin.objects4j.common.ConstraintViolationException;
 import org.fuin.objects4j.common.Contract;
 import org.fuin.objects4j.common.HasPublicStaticIsValidMethod;
 import org.fuin.objects4j.common.HasPublicStaticValueOfMethod;
-import javax.annotation.concurrent.Immutable;
-import jakarta.annotation.Nullable;
 import org.fuin.objects4j.ui.Label;
 import org.fuin.objects4j.ui.Prompt;
 import org.fuin.objects4j.ui.ShortLabel;
 import org.fuin.objects4j.ui.Tooltip;
 
+import javax.annotation.concurrent.Immutable;
 import java.io.Serial;
 import java.util.regex.Pattern;
 

diff --git a/core/src/main/java/org/fuin/objects4j/core/HourRange.java b/core/src/main/java/org/fuin/objects4j/core/HourRange.java
@@ -17,19 +17,19 @@
  */
 package org.fuin.objects4j.core;
 
+import jakarta.annotation.Nullable;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import org.fuin.objects4j.common.ConstraintViolationException;
 import org.fuin.objects4j.common.Contract;
 import org.fuin.objects4j.common.HasPublicStaticIsValidMethod;
 import org.fuin.objects4j.common.HasPublicStaticValueOfMethod;
-import javax.annotation.concurrent.Immutable;
-import jakarta.annotation.Nullable;
 import org.fuin.objects4j.ui.Label;
 import org.fuin.objects4j.ui.Prompt;
 import org.fuin.objects4j.ui.ShortLabel;
 import org.fuin.objects4j.ui.Tooltip;
 
+import javax.annotation.concurrent.Immutable;
 import java.io.Serial;
 import java.util.ArrayList;
 import java.util.BitSet;

diff --git a/core/src/main/java/org/fuin/objects4j/core/HourRanges.java b/core/src/main/java/org/fuin/objects4j/core/HourRanges.java
@@ -17,16 +17,16 @@
  */
 package org.fuin.objects4j.core;
 
+import jakarta.annotation.Nullable;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import org.fuin.objects4j.common.ConstraintViolationException;
 import org.fuin.objects4j.common.Contract;
 import org.fuin.objects4j.common.HasPublicStaticIsValidMethod;
 import org.fuin.objects4j.common.HasPublicStaticValueOfMethod;
-import javax.annotation.concurrent.Immutable;
-import jakarta.annotation.Nullable;
 import org.fuin.objects4j.ui.Prompt;
 
+import javax.annotation.concurrent.Immutable;
 import java.io.Serial;
 import java.util.ArrayList;
 import java.util.BitSet;

diff --git a/core/src/main/java/org/fuin/objects4j/core/KeyValue.java b/core/src/main/java/org/fuin/objects4j/core/KeyValue.java
@@ -19,8 +19,8 @@
 
 import jakarta.validation.constraints.NotNull;
 import org.fuin.objects4j.common.Contract;
-import javax.annotation.concurrent.Immutable;
 
+import javax.annotation.concurrent.Immutable;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;

diff --git a/core/src/main/java/org/fuin/objects4j/core/MultiDayOfTheWeek.java b/core/src/main/java/org/fuin/objects4j/core/MultiDayOfTheWeek.java
@@ -17,16 +17,16 @@
  */
 package org.fuin.objects4j.core;
 
+import jakarta.annotation.Nullable;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import org.fuin.objects4j.common.ConstraintViolationException;
 import org.fuin.objects4j.common.Contract;
 import org.fuin.objects4j.common.HasPublicStaticIsValidMethod;
 import org.fuin.objects4j.common.HasPublicStaticValueOfMethod;
-import javax.annotation.concurrent.Immutable;
-import jakarta.annotation.Nullable;
 import org.fuin.objects4j.ui.Prompt;
 
+import javax.annotation.concurrent.Immutable;
 import java.io.Serial;
 import java.util.ArrayList;
 import java.util.Collections;

diff --git a/core/src/main/java/org/fuin/objects4j/core/Password.java b/core/src/main/java/org/fuin/objects4j/core/Password.java
@@ -17,14 +17,14 @@
  */
 package org.fuin.objects4j.core;
 
+import jakarta.annotation.Nullable;
 import jakarta.validation.constraints.NotNull;
 import org.fuin.objects4j.common.Contract;
-import javax.annotation.concurrent.Immutable;
-import jakarta.annotation.Nullable;
 import org.fuin.objects4j.ui.Label;
 import org.fuin.objects4j.ui.ShortLabel;
 import org.fuin.objects4j.ui.Tooltip;
 
+import javax.annotation.concurrent.Immutable;
 import java.io.Serial;
 
 /**

diff --git a/core/src/main/java/org/fuin/objects4j/core/PasswordSha512.java b/core/src/main/java/org/fuin/objects4j/core/PasswordSha512.java
@@ -17,14 +17,14 @@
  */
 package org.fuin.objects4j.core;
 
+import jakarta.annotation.Nullable;
 import jakarta.validation.constraints.NotNull;
 import org.fuin.objects4j.common.ConstraintViolationException;
 import org.fuin.objects4j.common.Contract;
 import org.fuin.objects4j.common.HasPublicStaticIsValidMethod;
 import org.fuin.objects4j.common.HasPublicStaticValueOfMethod;
-import javax.annotation.concurrent.Immutable;
-import jakarta.annotation.Nullable;
 
+import javax.annotation.concurrent.Immutable;
 import java.io.Serial;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;

diff --git a/core/src/main/java/org/fuin/objects4j/core/SecurityToken.java b/core/src/main/java/org/fuin/objects4j/core/SecurityToken.java
@@ -21,8 +21,8 @@
 import jakarta.validation.constraints.NotNull;
 import org.fuin.objects4j.common.HasPublicStaticIsValidMethod;
 import org.fuin.objects4j.common.HasPublicStaticValueOfMethod;
-import javax.annotation.concurrent.Immutable;
 
+import javax.annotation.concurrent.Immutable;
 import java.io.Serial;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;

diff --git a/core/src/main/java/org/fuin/objects4j/core/UserName.java b/core/src/main/java/org/fuin/objects4j/core/UserName.java
@@ -23,10 +23,10 @@
 import org.fuin.objects4j.common.Contract;
 import org.fuin.objects4j.common.HasPublicStaticIsValidMethod;
 import org.fuin.objects4j.common.HasPublicStaticValueOfMethod;
-import javax.annotation.concurrent.Immutable;
 import org.fuin.objects4j.ui.Label;
 import org.fuin.objects4j.ui.ShortLabel;
 
+import javax.annotation.concurrent.Immutable;
 import java.io.Serial;
 import java.util.regex.Pattern;
 

diff --git a/core/src/main/java/org/fuin/objects4j/core/WeeklyOpeningHours.java b/core/src/main/java/org/fuin/objects4j/core/WeeklyOpeningHours.java
@@ -17,17 +17,17 @@
  */
 package org.fuin.objects4j.core;
 
+import jakarta.annotation.Nullable;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import org.fuin.objects4j.common.ConstraintViolationException;
 import org.fuin.objects4j.common.Contract;
 import org.fuin.objects4j.common.HasPublicStaticIsValidMethod;
 import org.fuin.objects4j.common.HasPublicStaticValueOfMethod;
-import javax.annotation.concurrent.Immutable;
-import jakarta.annotation.Nullable;
 import org.fuin.objects4j.core.DayOpeningHours.Change;
 import org.fuin.objects4j.ui.Prompt;
 
+import javax.annotation.concurrent.Immutable;
 import java.io.Serial;
 import java.util.ArrayList;
 import java.util.Collections;

diff --git a/jaxb/src/main/java/org/fuin/objects4j/jaxb/CurrencyAmountXmlAdapter.java b/jaxb/src/main/java/org/fuin/objects4j/jaxb/CurrencyAmountXmlAdapter.java
@@ -17,9 +17,10 @@
  */
 package org.fuin.objects4j.jaxb;
 
-import javax.annotation.concurrent.ThreadSafe;
 import org.fuin.objects4j.core.CurrencyAmount;
 
+import javax.annotation.concurrent.ThreadSafe;
+
 /**
  * Converts a {@link CurrencyAmount} from/to String.
  */

diff --git a/jaxb/src/main/java/org/fuin/objects4j/jaxb/CurrencyXmlAdapter.java b/jaxb/src/main/java/org/fuin/objects4j/jaxb/CurrencyXmlAdapter.java
@@ -18,9 +18,9 @@
 package org.fuin.objects4j.jaxb;
 
 import jakarta.xml.bind.annotation.adapters.XmlAdapter;
-import javax.annotation.concurrent.ThreadSafe;
 import org.fuin.objects4j.core.CurrencyStrValidator;
 
+import javax.annotation.concurrent.ThreadSafe;
 import java.util.Currency;
 
 /**

diff --git a/jaxb/src/main/java/org/fuin/objects4j/jaxb/DayOfTheWeekXmlAdapter.java b/jaxb/src/main/java/org/fuin/objects4j/jaxb/DayOfTheWeekXmlAdapter.java
@@ -17,9 +17,10 @@
  */
 package org.fuin.objects4j.jaxb;
 
-import javax.annotation.concurrent.ThreadSafe;
 import org.fuin.objects4j.core.DayOfTheWeek;
 
+import javax.annotation.concurrent.ThreadSafe;
+
 /**
  * Converts a {@link DayOfTheWeek} from/to String.
  */

diff --git a/jaxb/src/main/java/org/fuin/objects4j/jaxb/DayOpeningHoursXmlAdapter.java b/jaxb/src/main/java/org/fuin/objects4j/jaxb/DayOpeningHoursXmlAdapter.java
@@ -17,9 +17,10 @@
  */
 package org.fuin.objects4j.jaxb;
 
-import javax.annotation.concurrent.ThreadSafe;
 import org.fuin.objects4j.core.DayOpeningHours;
 
+import javax.annotation.concurrent.ThreadSafe;
+
 /**
  * Converts {@link DayOpeningHours} from/to String.
  */

diff --git a/jaxb/src/main/java/org/fuin/objects4j/jaxb/EmailAddressXmlAdapter.java b/jaxb/src/main/java/org/fuin/objects4j/jaxb/EmailAddressXmlAdapter.java
@@ -17,9 +17,10 @@
  */
 package org.fuin.objects4j.jaxb;
 
-import javax.annotation.concurrent.ThreadSafe;
 import org.fuin.objects4j.core.EmailAddress;
 
+import javax.annotation.concurrent.ThreadSafe;
+
 /**
  * Converts {@link EmailAddress} from/to String.
  */

diff --git a/jaxb/src/main/java/org/fuin/objects4j/jaxb/HourRangeXmlAdapter.java b/jaxb/src/main/java/org/fuin/objects4j/jaxb/HourRangeXmlAdapter.java
@@ -17,9 +17,10 @@
  */
 package org.fuin.objects4j.jaxb;
 
-import javax.annotation.concurrent.ThreadSafe;
 import org.fuin.objects4j.core.HourRange;
 
+import javax.annotation.concurrent.ThreadSafe;
+
 /**
  * Converts a {@link HourRange} into a String and back.
  */

diff --git a/jaxb/src/main/java/org/fuin/objects4j/jaxb/HourRangesXmlAdapter.java b/jaxb/src/main/java/org/fuin/objects4j/jaxb/HourRangesXmlAdapter.java
@@ -17,9 +17,10 @@
  */
 package org.fuin.objects4j.jaxb;
 
-import javax.annotation.concurrent.ThreadSafe;
 import org.fuin.objects4j.core.HourRanges;
 
+import javax.annotation.concurrent.ThreadSafe;
+
 /**
  * Converts {@link HourRanges} into a String and back.
  */

diff --git a/jaxb/src/main/java/org/fuin/objects4j/jaxb/HourXmlAdapter.java b/jaxb/src/main/java/org/fuin/objects4j/jaxb/HourXmlAdapter.java
@@ -17,9 +17,10 @@
  */
 package org.fuin.objects4j.jaxb;
 
-import javax.annotation.concurrent.ThreadSafe;
 import org.fuin.objects4j.core.Hour;
 
+import javax.annotation.concurrent.ThreadSafe;
+
 /**
  * Converts a {@link Hour} into a String and back.
  */

diff --git a/jaxb/src/main/java/org/fuin/objects4j/jaxb/LocaleXmlAdapter.java b/jaxb/src/main/java/org/fuin/objects4j/jaxb/LocaleXmlAdapter.java
@@ -18,9 +18,9 @@
 package org.fuin.objects4j.jaxb;
 
 import jakarta.xml.bind.annotation.adapters.XmlAdapter;
-import javax.annotation.concurrent.ThreadSafe;
 import org.fuin.objects4j.core.LocaleHelper;
 
+import javax.annotation.concurrent.ThreadSafe;
 import java.util.Locale;
 
 /**

diff --git a/jaxb/src/main/java/org/fuin/objects4j/jaxb/MultiDayOfTheWeekXmlAdapter.java b/jaxb/src/main/java/org/fuin/objects4j/jaxb/MultiDayOfTheWeekXmlAdapter.java
@@ -17,9 +17,10 @@
  */
 package org.fuin.objects4j.jaxb;
 
-import javax.annotation.concurrent.ThreadSafe;
 import org.fuin.objects4j.core.MultiDayOfTheWeek;
 
+import javax.annotation.concurrent.ThreadSafe;
+
 /**
  * Converts {@link MultiDayOfTheWeek} into a String and back.
  */

diff --git a/jaxb/src/main/java/org/fuin/objects4j/jaxb/PasswordSha512XmlAdapter.java b/jaxb/src/main/java/org/fuin/objects4j/jaxb/PasswordSha512XmlAdapter.java
@@ -17,9 +17,10 @@
  */
 package org.fuin.objects4j.jaxb;
 
-import javax.annotation.concurrent.ThreadSafe;
 import org.fuin.objects4j.core.PasswordSha512;
 
+import javax.annotation.concurrent.ThreadSafe;
+
 /**
  * Converts a {@link PasswordSha512} from/to String.
  */

diff --git a/jaxb/src/main/java/org/fuin/objects4j/jaxb/PasswordXmlAdapter.java b/jaxb/src/main/java/org/fuin/objects4j/jaxb/PasswordXmlAdapter.java
@@ -17,9 +17,10 @@
  */
 package org.fuin.objects4j.jaxb;
 
-import javax.annotation.concurrent.ThreadSafe;
 import org.fuin.objects4j.core.Password;
 
+import javax.annotation.concurrent.ThreadSafe;
+
 /**
  * Converts a {@link Password} from/to String.
  */

diff --git a/jaxb/src/main/java/org/fuin/objects4j/jaxb/UUIDXmlAdapter.java b/jaxb/src/main/java/org/fuin/objects4j/jaxb/UUIDXmlAdapter.java
@@ -18,8 +18,8 @@
 package org.fuin.objects4j.jaxb;
 
 import jakarta.xml.bind.annotation.adapters.XmlAdapter;
-import javax.annotation.concurrent.ThreadSafe;
 
+import javax.annotation.concurrent.ThreadSafe;
 import java.util.UUID;
 
 /**