Merge b468bcf into 57a6b0e

ExpediaGroup · Jul 3, 2018 · 660ab99 · 660ab99
2 parents 57a6b0e + b468bcf
commit 660ab99
Show file tree

Hide file tree

Showing 82 changed files with 461 additions and 355 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## TBD
 ### Changed
 * circus-train-vacuum-tool moved into [Housekeeping](https://github.com/HotelsDotCom/housekeeping) project under the module housekeeping-vacuum-tool.
+* ConfiGuration classes moved from Core to API sub-project. See [#78](https://github.com/HotelsDotCom/circus-train/issues/782).
 
 ## 11.5.2 - 2018-06-15
 ### Changed

diff --git a/circus-train-api/pom.xml b/circus-train-api/pom.xml
@@ -12,6 +12,11 @@
   <description>Design contracts.</description>
 
   <dependencies>
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-validator</artifactId>
+    </dependency>
+
     <!-- Hadoop -->
     <dependency>
       <groupId>org.apache.hadoop</groupId>
@@ -52,6 +57,12 @@
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.openpojo</groupId>
+      <artifactId>openpojo</artifactId>
+      <version>0.8.4</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.hive</groupId>
       <artifactId>hive-exec</artifactId>

diff --git a/...ircustrain/core/conf/MetastoreTunnel.java → ...circustrain/api/conf/MetastoreTunnel.java b/...ircustrain/core/conf/MetastoreTunnel.java → ...circustrain/api/conf/MetastoreTunnel.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hotels.bdp.circustrain.core.conf;
+package com.hotels.bdp.circustrain.api.conf;
 
 import static javax.validation.constraints.Pattern.Flag.CASE_INSENSITIVE;
 
@@ -23,7 +23,7 @@
 
 import org.hibernate.validator.constraints.NotBlank;
 
-import com.hotels.bdp.circustrain.validation.constraints.TunnelRoute;
+import com.hotels.bdp.circustrain.api.validation.constraints.TunnelRoute;
 
 public class MetastoreTunnel {
 

diff --git a/...ircustrain/core/conf/MetricsReporter.java → ...circustrain/api/conf/MetricsReporter.java b/...ircustrain/core/conf/MetricsReporter.java → ...circustrain/api/conf/MetricsReporter.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2017 Expedia Inc.
+ * Copyright (C) 2016-2018 Expedia Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,15 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hotels.bdp.circustrain.core.conf;
+package com.hotels.bdp.circustrain.api.conf;
 
 import java.util.concurrent.TimeUnit;
 
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@ConfigurationProperties(prefix = "metrics-reporter")
 public class MetricsReporter {
 
   private long period = 1L;

diff --git a/...circustrain/core/conf/ReplicaCatalog.java → .../circustrain/api/conf/ReplicaCatalog.java b/...circustrain/core/conf/ReplicaCatalog.java → .../circustrain/api/conf/ReplicaCatalog.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2017 Expedia Inc.
+ * Copyright (C) 2016-2018 Expedia Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,19 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hotels.bdp.circustrain.core.conf;
+package com.hotels.bdp.circustrain.api.conf;
 
 import java.util.List;
 import java.util.Map;
 
 import javax.validation.Valid;
 
 import org.hibernate.validator.constraints.NotBlank;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
 
-@Configuration
-@ConfigurationProperties(prefix = "replica-catalog")
 public class ReplicaCatalog implements TunnelMetastoreCatalog {
 
   private @NotBlank String name;

diff --git a/...p/circustrain/core/conf/ReplicaTable.java → ...dp/circustrain/api/conf/ReplicaTable.java b/...p/circustrain/core/conf/ReplicaTable.java → ...dp/circustrain/api/conf/ReplicaTable.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2017 Expedia Inc.
+ * Copyright (C) 2016-2018 Expedia Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hotels.bdp.circustrain.core.conf;
+package com.hotels.bdp.circustrain.api.conf;
 
 public class ReplicaTable {
 

diff --git a/...ircustrain/core/conf/ReplicationMode.java → ...circustrain/api/conf/ReplicationMode.java b/...ircustrain/core/conf/ReplicationMode.java → ...circustrain/api/conf/ReplicationMode.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2017 Expedia Inc.
+ * Copyright (C) 2016-2018 Expedia Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hotels.bdp.circustrain.core.conf;
+package com.hotels.bdp.circustrain.api.conf;
 
 public enum ReplicationMode {
 

diff --git a/...s/bdp/circustrain/core/conf/Security.java → ...ls/bdp/circustrain/api/conf/Security.java b/...s/bdp/circustrain/core/conf/Security.java → ...ls/bdp/circustrain/api/conf/Security.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2017 Expedia Inc.
+ * Copyright (C) 2016-2018 Expedia Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,13 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hotels.bdp.circustrain.core.conf;
+package com.hotels.bdp.circustrain.api.conf;
 
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@ConfigurationProperties(prefix = "security")
 public class Security {
 
   private String credentialProvider;

diff --git a/.../circustrain/core/conf/SourceCatalog.java → ...p/circustrain/api/conf/SourceCatalog.java b/.../circustrain/core/conf/SourceCatalog.java → ...p/circustrain/api/conf/SourceCatalog.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2017 Expedia Inc.
+ * Copyright (C) 2016-2018 Expedia Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,23 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hotels.bdp.circustrain.core.conf;
+package com.hotels.bdp.circustrain.api.conf;
 
 import java.util.List;
 import java.util.Map;
 
 import javax.validation.Valid;
 
 import org.hibernate.validator.constraints.NotBlank;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Profile;
 
-import com.hotels.bdp.circustrain.api.Modules;
-
-@Profile({ Modules.REPLICATION })
-@Configuration
-@ConfigurationProperties(prefix = "source-catalog")
 public class SourceCatalog implements TunnelMetastoreCatalog {
 
   private @NotBlank String name;

diff --git a/...dp/circustrain/core/conf/SourceTable.java → ...bdp/circustrain/api/conf/SourceTable.java b/...dp/circustrain/core/conf/SourceTable.java → ...bdp/circustrain/api/conf/SourceTable.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2017 Expedia Inc.
+ * Copyright (C) 2016-2018 Expedia Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hotels.bdp.circustrain.core.conf;
+package com.hotels.bdp.circustrain.api.conf;
 
 import javax.annotation.Nullable;
 import javax.validation.constraints.Min;

diff --git a/...rcustrain/core/conf/TableReplication.java → ...ircustrain/api/conf/TableReplication.java b/...rcustrain/core/conf/TableReplication.java → ...ircustrain/api/conf/TableReplication.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2017 Expedia Inc.
+ * Copyright (C) 2016-2018 Expedia Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hotels.bdp.circustrain.core.conf;
+package com.hotels.bdp.circustrain.api.conf;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 
-import com.hotels.bdp.circustrain.validation.constraints.TableReplicationFullReplicationModeConstraint;
+import com.hotels.bdp.circustrain.api.validation.constraints.TableReplicationFullReplicationModeConstraint;
 
 @TableReplicationFullReplicationModeConstraint
 public class TableReplication {

diff --git a/...custrain/core/conf/TableReplications.java → ...rcustrain/api/conf/TableReplications.java b/...custrain/core/conf/TableReplications.java → ...rcustrain/api/conf/TableReplications.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2017 Expedia Inc.
+ * Copyright (C) 2016-2018 Expedia Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,22 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hotels.bdp.circustrain.core.conf;
+package com.hotels.bdp.circustrain.api.conf;
 
 import java.util.List;
 
 import javax.validation.Valid;
 
 import org.hibernate.validator.constraints.NotEmpty;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Profile;
 
-import com.hotels.bdp.circustrain.api.Modules;
-
-@Profile({ Modules.REPLICATION })
-@Configuration
-@ConfigurationProperties(prefix = "")
 public class TableReplications {
 
   private @Valid @NotEmpty List<TableReplication> tableReplications;

diff --git a/...ain/core/conf/TunnelMetastoreCatalog.java → ...rain/api/conf/TunnelMetastoreCatalog.java b/...ain/core/conf/TunnelMetastoreCatalog.java → ...rain/api/conf/TunnelMetastoreCatalog.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2017 Expedia Inc.
+ * Copyright (C) 2016-2018 Expedia Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hotels.bdp.circustrain.core.conf;
+package com.hotels.bdp.circustrain.api.conf;
 
 import com.hotels.bdp.circustrain.api.conf.MetastoreCatalog;
 

diff --git a/...train/core/conf/GenericCopierOptions.java → ...rain/api/copier/GenericCopierOptions.java b/...train/core/conf/GenericCopierOptions.java → ...rain/api/copier/GenericCopierOptions.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2017 Expedia Inc.
+ * Copyright (C) 2016-2018 Expedia Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,17 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hotels.bdp.circustrain.core.conf;
+package com.hotels.bdp.circustrain.api.copier;
 
 import java.util.Map;
 
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-
-import com.hotels.bdp.circustrain.api.copier.CopierOptions;
-
-@Configuration
-@ConfigurationProperties(prefix = "")
 public class GenericCopierOptions implements CopierOptions {
 
   private Map<String, Object> copierOptions;

diff --git a/...icationFullReplicationModeConstraint.java → ...icationFullReplicationModeConstraint.java b/...icationFullReplicationModeConstraint.java → ...icationFullReplicationModeConstraint.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2017 Expedia Inc.
+ * Copyright (C) 2016-2018 Expedia Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hotels.bdp.circustrain.validation.constraints;
+package com.hotels.bdp.circustrain.api.validation.constraints;
 
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
@@ -25,7 +25,7 @@
 import javax.validation.Payload;
 import javax.validation.ReportAsSingleViolation;
 
-import com.hotels.bdp.circustrain.validation.constraintvalidators.TableReplicationFullReplicationModeValidator;
+import com.hotels.bdp.circustrain.api.validation.constraintvalidators.TableReplicationFullReplicationModeValidator;
 
 @Constraint(validatedBy = { TableReplicationFullReplicationModeValidator.class })
 @Target({ TYPE })

diff --git a/...n/validation/constraints/TunnelRoute.java → ...i/validation/constraints/TunnelRoute.java b/...n/validation/constraints/TunnelRoute.java → ...i/validation/constraints/TunnelRoute.java
@@ -1,9 +1,5 @@
 /**
- * Copyright (C) 2016-2017 Expedia Inc and the original hibernate-validator contributors.
- *
- * Based on:
- *
- * https://github.com/hibernate/hibernate-validator/blob/5.2/engine/src/main/java/org/hibernate/validator/constraints/Email.java#L37
+ * Copyright (C) 2016-2018 Expedia Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hotels.bdp.circustrain.validation.constraints;
+package com.hotels.bdp.circustrain.api.validation.constraints;
 
 import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
 import static java.lang.annotation.ElementType.CONSTRUCTOR;
@@ -36,7 +32,7 @@
 import javax.validation.ReportAsSingleViolation;
 import javax.validation.constraints.Pattern;
 
-import com.hotels.bdp.circustrain.validation.constraintvalidators.TunnelRouteValidator;
+import com.hotels.bdp.circustrain.api.validation.constraintvalidators.TunnelRouteValidator;
 
 /**
  * Validates the annotated {@link String} is sequence of one or more {@link java.net.URI} separated by the literal

diff --git a/...licationFullReplicationModeValidator.java → ...licationFullReplicationModeValidator.java b/...licationFullReplicationModeValidator.java → ...licationFullReplicationModeValidator.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2017 Expedia Inc.
+ * Copyright (C) 2016-2018 Expedia Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hotels.bdp.circustrain.validation.constraintvalidators;
+package com.hotels.bdp.circustrain.api.validation.constraintvalidators;
 
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
 
 import org.apache.commons.lang3.StringUtils;
 
-import com.hotels.bdp.circustrain.core.conf.ReplicationMode;
-import com.hotels.bdp.circustrain.core.conf.TableReplication;
-import com.hotels.bdp.circustrain.validation.constraints.TableReplicationFullReplicationModeConstraint;
+import com.hotels.bdp.circustrain.api.conf.ReplicationMode;
+import com.hotels.bdp.circustrain.api.conf.TableReplication;
+import com.hotels.bdp.circustrain.api.validation.constraints.TableReplicationFullReplicationModeConstraint;
 
 public class TableReplicationFullReplicationModeValidator
     implements ConstraintValidator<TableReplicationFullReplicationModeConstraint, TableReplication> {