From da5604a38de42be8fa859c8328441b91d156197d Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 5 Dec 2019 08:59:39 +1300
Subject: [PATCH] #1880 - Cidr type stored as INET (instead of CIDR) + named as
 Cdir (typo)

---
 .../ebeaninternal/server/type/DefaultTypeManager.java  |  4 ++--
 .../type/{ScalarTypeCdir.java => ScalarTypeCidr.java}  | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)
 rename src/main/java/io/ebeaninternal/server/type/{ScalarTypeCdir.java => ScalarTypeCidr.java} (83%)

diff --git a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index 907484a4d..094a78758 100644
--- a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -993,10 +993,10 @@ public final class DefaultTypeManager implements TypeManager {
     }
 
     if (offlineMigrationGeneration || postgres) {
-      addType(Cidr.class, new ScalarTypeCdir.Postgres());
+      addType(Cidr.class, new ScalarTypeCidr.Postgres());
       addType(Inet.class, new ScalarTypeInet.Postgres());
     } else {
-      addType(Cidr.class, new ScalarTypeCdir.Varchar());
+      addType(Cidr.class, new ScalarTypeCidr.Varchar());
       addType(Inet.class, new ScalarTypeInet.Varchar());
     }
 
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeCdir.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeCidr.java
similarity index 83%
rename from src/main/java/io/ebeaninternal/server/type/ScalarTypeCdir.java
rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeCidr.java
index fe7573f49..60965bdc8 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeCdir.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeCidr.java
@@ -7,11 +7,11 @@ import java.sql.SQLException;
 import java.sql.Types;
 
 /**
- * ScalarType for Cdir to Varchar or Postgres CDIR.
+ * ScalarType for Cidr to Varchar or Postgres CIDR.
  */
-public abstract class ScalarTypeCdir extends ScalarTypeBaseVarchar<Cidr> {
+public abstract class ScalarTypeCidr extends ScalarTypeBaseVarchar<Cidr> {
 
-  ScalarTypeCdir() {
+  ScalarTypeCidr() {
     super(Cidr.class, false, ExtraDbTypes.CIDR);
   }
 
@@ -41,7 +41,7 @@ public abstract class ScalarTypeCdir extends ScalarTypeBaseVarchar<Cidr> {
   /**
    * Cdir to Varchar.
    */
-  public static class Varchar extends ScalarTypeCdir {
+  public static class Varchar extends ScalarTypeCidr {
 
     @Override
     public void bind(DataBind b, Cidr value) throws SQLException {
@@ -56,7 +56,7 @@ public abstract class ScalarTypeCdir extends ScalarTypeBaseVarchar<Cidr> {
   /**
    * Cdir to Postgres CDIR.
    */
-  public static class Postgres extends ScalarTypeCdir {
+  public static class Postgres extends ScalarTypeCidr {
 
     @Override
     public void bind(DataBind b, Cidr value) throws SQLException {