From d2ff1ddf43e7c35a169b6dfd807c5f4fe342a975 Mon Sep 17 00:00:00 2001 From: Sualeh Fatehi Date: Wed, 7 Feb 2018 21:12:23 -0500 Subject: [PATCH] Code formatting --- .../java/schemacrawler/crawl/AbstractColumn.java | 2 +- .../crawl/AbstractDatabaseObject.java | 2 +- .../crawl/AbstractDependantObject.java | 2 +- .../schemacrawler/crawl/AbstractNamedObject.java | 2 +- .../crawl/AbstractNamedObjectWithAttributes.java | 2 +- .../schemacrawler/crawl/ForeignKeyRetriever.java | 2 +- .../schemacrawler/crawl/FunctionPartial.java | 8 ++++---- .../java/schemacrawler/crawl/MutableRoutine.java | 2 +- .../crawl/MutableRoutineColumn.java | 2 +- .../schemacrawler/crawl/ProcedurePartial.java | 8 ++++---- .../java/schemacrawler/crawl/RoutinePartial.java | 2 +- .../java/schemacrawler/schema/ForeignKey.java | 16 ++++++++-------- .../main/java/schemacrawler/schema/Reducer.java | 1 + 13 files changed, 26 insertions(+), 25 deletions(-) diff --git a/schemacrawler-api/src/main/java/schemacrawler/crawl/AbstractColumn.java b/schemacrawler-api/src/main/java/schemacrawler/crawl/AbstractColumn.java index 0072452058..13398adab0 100644 --- a/schemacrawler-api/src/main/java/schemacrawler/crawl/AbstractColumn.java +++ b/schemacrawler-api/src/main/java/schemacrawler/crawl/AbstractColumn.java @@ -57,7 +57,7 @@ abstract class AbstractColumn

/** * Effective Java - Item 17 - Minimize Mutability - Package-private * constructors make a class effectively final - * + * * @param parent * Parent of this object * @param name diff --git a/schemacrawler-api/src/main/java/schemacrawler/crawl/AbstractDatabaseObject.java b/schemacrawler-api/src/main/java/schemacrawler/crawl/AbstractDatabaseObject.java index c0a3a561e4..225c262573 100644 --- a/schemacrawler-api/src/main/java/schemacrawler/crawl/AbstractDatabaseObject.java +++ b/schemacrawler-api/src/main/java/schemacrawler/crawl/AbstractDatabaseObject.java @@ -57,7 +57,7 @@ abstract class AbstractDatabaseObject /** * Effective Java - Item 17 - Minimize Mutability - Package-private * constructors make a class effectively final - * + * * @param schema * Schema of this object * @param name diff --git a/schemacrawler-api/src/main/java/schemacrawler/crawl/AbstractDependantObject.java b/schemacrawler-api/src/main/java/schemacrawler/crawl/AbstractDependantObject.java index 30de6395e9..474b6a02fe 100644 --- a/schemacrawler-api/src/main/java/schemacrawler/crawl/AbstractDependantObject.java +++ b/schemacrawler-api/src/main/java/schemacrawler/crawl/AbstractDependantObject.java @@ -56,7 +56,7 @@ abstract class AbstractDependantObject /** * Effective Java - Item 17 - Minimize Mutability - Package-private * constructors make a class effectively final - * + * * @param parent * Parent of this object * @param name diff --git a/schemacrawler-api/src/main/java/schemacrawler/crawl/AbstractNamedObject.java b/schemacrawler-api/src/main/java/schemacrawler/crawl/AbstractNamedObject.java index ade33e8452..f3c4cd9d95 100644 --- a/schemacrawler-api/src/main/java/schemacrawler/crawl/AbstractNamedObject.java +++ b/schemacrawler-api/src/main/java/schemacrawler/crawl/AbstractNamedObject.java @@ -52,7 +52,7 @@ abstract class AbstractNamedObject /** * Effective Java - Item 17 - Minimize Mutability - Package-private * constructors make a class effectively final - * + * * @param name * Name of the named object */ diff --git a/schemacrawler-api/src/main/java/schemacrawler/crawl/AbstractNamedObjectWithAttributes.java b/schemacrawler-api/src/main/java/schemacrawler/crawl/AbstractNamedObjectWithAttributes.java index e5ed1fe939..3453289b34 100644 --- a/schemacrawler-api/src/main/java/schemacrawler/crawl/AbstractNamedObjectWithAttributes.java +++ b/schemacrawler-api/src/main/java/schemacrawler/crawl/AbstractNamedObjectWithAttributes.java @@ -57,7 +57,7 @@ abstract class AbstractNamedObjectWithAttributes /** * Effective Java - Item 17 - Minimize Mutability - Package-private * constructors make a class effectively final - * + * * @param name * Name of the named object */ diff --git a/schemacrawler-api/src/main/java/schemacrawler/crawl/ForeignKeyRetriever.java b/schemacrawler-api/src/main/java/schemacrawler/crawl/ForeignKeyRetriever.java index 3f7a32797a..4fbf783c7a 100644 --- a/schemacrawler-api/src/main/java/schemacrawler/crawl/ForeignKeyRetriever.java +++ b/schemacrawler-api/src/main/java/schemacrawler/crawl/ForeignKeyRetriever.java @@ -181,7 +181,7 @@ private void createForeignKeys(final MetadataResultSet results, { while (results.next()) { - String foreignKeyName = results.getString("FK_NAME"); + final String foreignKeyName = results.getString("FK_NAME"); LOGGER .log(Level.FINE, new StringFormat("Retrieving foreign key: %s", foreignKeyName)); diff --git a/schemacrawler-api/src/main/java/schemacrawler/crawl/FunctionPartial.java b/schemacrawler-api/src/main/java/schemacrawler/crawl/FunctionPartial.java index ec51b9946d..a6ab356caa 100644 --- a/schemacrawler-api/src/main/java/schemacrawler/crawl/FunctionPartial.java +++ b/schemacrawler-api/src/main/java/schemacrawler/crawl/FunctionPartial.java @@ -59,15 +59,15 @@ public List getColumns() } @Override - public RoutineType getRoutineType() + public FunctionReturnType getReturnType() { - return RoutineType.function; + throw new NotLoadedException(this); } @Override - public FunctionReturnType getReturnType() + public RoutineType getRoutineType() { - throw new NotLoadedException(this); + return RoutineType.function; } @Override diff --git a/schemacrawler-api/src/main/java/schemacrawler/crawl/MutableRoutine.java b/schemacrawler-api/src/main/java/schemacrawler/crawl/MutableRoutine.java index ed1be6c2bc..c6edb41a57 100644 --- a/schemacrawler-api/src/main/java/schemacrawler/crawl/MutableRoutine.java +++ b/schemacrawler-api/src/main/java/schemacrawler/crawl/MutableRoutine.java @@ -57,7 +57,7 @@ abstract class MutableRoutine /** * Effective Java - Item 17 - Minimize Mutability - Package-private * constructors make a class effectively final - * + * * @param schema * Schema of this object * @param name diff --git a/schemacrawler-api/src/main/java/schemacrawler/crawl/MutableRoutineColumn.java b/schemacrawler-api/src/main/java/schemacrawler/crawl/MutableRoutineColumn.java index 5a9e5b68e7..a155e00b05 100644 --- a/schemacrawler-api/src/main/java/schemacrawler/crawl/MutableRoutineColumn.java +++ b/schemacrawler-api/src/main/java/schemacrawler/crawl/MutableRoutineColumn.java @@ -48,7 +48,7 @@ abstract class MutableRoutineColumn /** * Effective Java - Item 17 - Minimize Mutability - Package-private * constructors make a class effectively final - * + * * @param parent * Parent of this object * @param name diff --git a/schemacrawler-api/src/main/java/schemacrawler/crawl/ProcedurePartial.java b/schemacrawler-api/src/main/java/schemacrawler/crawl/ProcedurePartial.java index f0a91e8881..1366efb5fc 100644 --- a/schemacrawler-api/src/main/java/schemacrawler/crawl/ProcedurePartial.java +++ b/schemacrawler-api/src/main/java/schemacrawler/crawl/ProcedurePartial.java @@ -59,15 +59,15 @@ public List getColumns() } @Override - public RoutineType getRoutineType() + public ProcedureReturnType getReturnType() { - return RoutineType.procedure; + throw new NotLoadedException(this); } @Override - public ProcedureReturnType getReturnType() + public RoutineType getRoutineType() { - throw new NotLoadedException(this); + return RoutineType.procedure; } @Override diff --git a/schemacrawler-api/src/main/java/schemacrawler/crawl/RoutinePartial.java b/schemacrawler-api/src/main/java/schemacrawler/crawl/RoutinePartial.java index 69b9790661..a0946b536b 100644 --- a/schemacrawler-api/src/main/java/schemacrawler/crawl/RoutinePartial.java +++ b/schemacrawler-api/src/main/java/schemacrawler/crawl/RoutinePartial.java @@ -45,7 +45,7 @@ abstract class RoutinePartial /** * Effective Java - Item 17 - Minimize Mutability - Package-private * constructors make a class effectively final - * + * * @param schema * Schema of this object * @param name diff --git a/schemacrawler-api/src/main/java/schemacrawler/schema/ForeignKey.java b/schemacrawler-api/src/main/java/schemacrawler/schema/ForeignKey.java index 1b06f2a98f..db4ce5e450 100644 --- a/schemacrawler-api/src/main/java/schemacrawler/schema/ForeignKey.java +++ b/schemacrawler-api/src/main/java/schemacrawler/schema/ForeignKey.java @@ -53,19 +53,19 @@ public interface ForeignKey */ ForeignKeyUpdateRule getDeleteRule(); - /** - * Gets the update rule. - * - * @return Update rule - */ - ForeignKeyUpdateRule getUpdateRule(); - /** * Gets a generated specific name for databases that support * non-unique foreign key names. - * + * * @return Specific name of a foreign key */ String getSpecificName(); + /** + * Gets the update rule. + * + * @return Update rule + */ + ForeignKeyUpdateRule getUpdateRule(); + } diff --git a/schemacrawler-api/src/main/java/schemacrawler/schema/Reducer.java b/schemacrawler-api/src/main/java/schemacrawler/schema/Reducer.java index 8a38972d66..4d735d6bee 100644 --- a/schemacrawler-api/src/main/java/schemacrawler/schema/Reducer.java +++ b/schemacrawler-api/src/main/java/schemacrawler/schema/Reducer.java @@ -27,6 +27,7 @@ */ package schemacrawler.schema; + @FunctionalInterface public interface Reducer {