Relocate some classes to the new common modules

Netflix · Apr 20, 2018 · 92eefd7 · 92eefd7
1 parent 5eb67e8
commit 92eefd7
Show file tree

Hide file tree

Showing 133 changed files with 381 additions and 294 deletions.
diff --git a/genie-agent/build.gradle b/genie-agent/build.gradle
@@ -10,6 +10,7 @@ dependencies {
      *******************************/
 
     compile project(":genie-common")
+    compile(project(":genie-common-internal"))
     compile project(":genie-proto")
 
     // Spring

diff --git a/genie-agent/src/main/java/com/netflix/genie/agent/cli/ArgumentConverters.java b/genie-agent/src/main/java/com/netflix/genie/agent/cli/ArgumentConverters.java
@@ -22,7 +22,7 @@
 import com.beust.jcommander.ParameterException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.google.common.collect.Sets;
-import com.netflix.genie.common.dto.v4.Criterion;
+import com.netflix.genie.common.internal.dto.v4.Criterion;
 import com.netflix.genie.common.exceptions.GeniePreconditionException;
 import com.netflix.genie.common.util.GenieObjectMapper;
 import org.apache.commons.lang3.StringUtils;

diff --git a/genie-agent/src/main/java/com/netflix/genie/agent/cli/ArgumentDelegates.java b/genie-agent/src/main/java/com/netflix/genie/agent/cli/ArgumentDelegates.java
@@ -19,7 +19,7 @@
 package com.netflix.genie.agent.cli;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import com.netflix.genie.common.dto.v4.Criterion;
+import com.netflix.genie.common.internal.dto.v4.Criterion;
 
 import java.io.File;
 import java.util.List;

diff --git a/genie-agent/src/main/java/com/netflix/genie/agent/cli/JobRequestArgumentsImpl.java b/genie-agent/src/main/java/com/netflix/genie/agent/cli/JobRequestArgumentsImpl.java
@@ -23,7 +23,7 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-import com.netflix.genie.common.dto.v4.Criterion;
+import com.netflix.genie.common.internal.dto.v4.Criterion;
 import com.netflix.genie.common.util.GenieObjectMapper;
 import lombok.Getter;
 import org.springframework.stereotype.Component;

diff --git a/genie-agent/src/main/java/com/netflix/genie/agent/cli/JobRequestConverter.java b/genie-agent/src/main/java/com/netflix/genie/agent/cli/JobRequestConverter.java
@@ -18,9 +18,9 @@
 
 package com.netflix.genie.agent.cli;
 
-import com.netflix.genie.common.dto.v4.AgentJobRequest;
-import com.netflix.genie.common.dto.v4.ExecutionResourceCriteria;
-import com.netflix.genie.common.dto.v4.JobMetadata;
+import com.netflix.genie.common.internal.dto.v4.AgentJobRequest;
+import com.netflix.genie.common.internal.dto.v4.ExecutionResourceCriteria;
+import com.netflix.genie.common.internal.dto.v4.JobMetadata;
 import lombok.Getter;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;

diff --git a/genie-agent/src/main/java/com/netflix/genie/agent/cli/ResolveJobSpecCommand.java b/genie-agent/src/main/java/com/netflix/genie/agent/cli/ResolveJobSpecCommand.java
@@ -26,8 +26,8 @@
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.netflix.genie.agent.execution.exceptions.JobSpecificationResolutionException;
 import com.netflix.genie.agent.execution.services.AgentJobSpecificationService;
-import com.netflix.genie.common.dto.v4.AgentJobRequest;
-import com.netflix.genie.common.dto.v4.JobSpecification;
+import com.netflix.genie.common.internal.dto.v4.AgentJobRequest;
+import com.netflix.genie.common.internal.dto.v4.JobSpecification;
 import com.netflix.genie.common.util.GenieObjectMapper;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;

diff --git a/genie-agent/src/main/java/com/netflix/genie/agent/execution/ExecutionContext.java b/genie-agent/src/main/java/com/netflix/genie/agent/execution/ExecutionContext.java
@@ -21,7 +21,7 @@
 import com.netflix.genie.agent.execution.statemachine.States;
 import com.netflix.genie.agent.execution.statemachine.actions.StateAction;
 import com.netflix.genie.common.dto.JobStatus;
-import com.netflix.genie.common.dto.v4.JobSpecification;
+import com.netflix.genie.common.internal.dto.v4.JobSpecification;
 import org.apache.commons.lang3.tuple.Triple;
 import org.springframework.statemachine.action.Action;
 

diff --git a/genie-agent/src/main/java/com/netflix/genie/agent/execution/ExecutionContextImpl.java b/genie-agent/src/main/java/com/netflix/genie/agent/execution/ExecutionContextImpl.java
@@ -22,7 +22,7 @@
 import com.netflix.genie.agent.execution.statemachine.States;
 import com.netflix.genie.agent.execution.statemachine.actions.StateAction;
 import com.netflix.genie.common.dto.JobStatus;
-import com.netflix.genie.common.dto.v4.JobSpecification;
+import com.netflix.genie.common.internal.dto.v4.JobSpecification;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.tuple.Triple;
 import org.springframework.context.annotation.Lazy;

diff --git a/...rc/main/java/com/netflix/genie/agent/execution/services/AgentJobSpecificationService.java b/...rc/main/java/com/netflix/genie/agent/execution/services/AgentJobSpecificationService.java
@@ -18,8 +18,8 @@
 package com.netflix.genie.agent.execution.services;
 
 import com.netflix.genie.agent.execution.exceptions.JobSpecificationResolutionException;
-import com.netflix.genie.common.dto.v4.AgentJobRequest;
-import com.netflix.genie.common.dto.v4.JobSpecification;
+import com.netflix.genie.common.internal.dto.v4.AgentJobRequest;
+import com.netflix.genie.common.internal.dto.v4.JobSpecification;
 import org.springframework.validation.annotation.Validated;
 
 import javax.validation.Valid;

diff --git a/...etflix/genie/agent/execution/services/impl/grpc/GRpcAgentJobSpecificationServiceImpl.java b/...etflix/genie/agent/execution/services/impl/grpc/GRpcAgentJobSpecificationServiceImpl.java
@@ -21,13 +21,13 @@
 import com.google.common.util.concurrent.ListenableFuture;
 import com.netflix.genie.agent.execution.exceptions.JobSpecificationResolutionException;
 import com.netflix.genie.agent.execution.services.AgentJobSpecificationService;
-import com.netflix.genie.common.dto.v4.AgentJobRequest;
-import com.netflix.genie.common.dto.v4.JobSpecification;
+import com.netflix.genie.common.internal.dto.v4.AgentJobRequest;
+import com.netflix.genie.common.internal.dto.v4.JobSpecification;
 import com.netflix.genie.proto.GetJobSpecificationRequest;
 import com.netflix.genie.proto.JobSpecificationResponse;
 import com.netflix.genie.proto.JobSpecificationServiceGrpc;
 import com.netflix.genie.proto.ResolveJobSpecificationRequest;
-import com.netflix.genie.proto.v4.converters.JobSpecificationServiceConverter;
+import com.netflix.genie.common.internal.dto.v4.converters.JobSpecificationServiceConverter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;

diff --git a/...src/main/java/com/netflix/genie/agent/execution/statemachine/actions/LaunchJobAction.java b/...src/main/java/com/netflix/genie/agent/execution/statemachine/actions/LaunchJobAction.java
@@ -22,7 +22,7 @@
 import com.netflix.genie.agent.execution.exceptions.JobLaunchException;
 import com.netflix.genie.agent.execution.services.LaunchJobService;
 import com.netflix.genie.agent.execution.statemachine.Events;
-import com.netflix.genie.common.dto.v4.JobSpecification;
+import com.netflix.genie.common.internal.dto.v4.JobSpecification;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;

diff --git a/...com/netflix/genie/agent/execution/statemachine/actions/ResolveJobSpecificationAction.java b/...com/netflix/genie/agent/execution/statemachine/actions/ResolveJobSpecificationAction.java
@@ -24,8 +24,8 @@
 import com.netflix.genie.agent.execution.exceptions.JobSpecificationResolutionException;
 import com.netflix.genie.agent.execution.services.AgentJobSpecificationService;
 import com.netflix.genie.agent.execution.statemachine.Events;
-import com.netflix.genie.common.dto.v4.AgentJobRequest;
-import com.netflix.genie.common.dto.v4.JobSpecification;
+import com.netflix.genie.common.internal.dto.v4.AgentJobRequest;
+import com.netflix.genie.common.internal.dto.v4.JobSpecification;
 import com.netflix.genie.common.util.GenieObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Lazy;

diff --git a/.../src/main/java/com/netflix/genie/agent/execution/statemachine/actions/SetUpJobAction.java b/.../src/main/java/com/netflix/genie/agent/execution/statemachine/actions/SetUpJobAction.java
@@ -27,9 +27,9 @@
 import com.netflix.genie.agent.execution.statemachine.Events;
 import com.netflix.genie.agent.utils.EnvUtils;
 import com.netflix.genie.agent.utils.PathUtils;
-import com.netflix.genie.common.dto.v4.ExecutionEnvironment;
-import com.netflix.genie.common.dto.v4.JobSpecification;
-import com.netflix.genie.common.jobs.JobConstants;
+import com.netflix.genie.common.internal.dto.v4.ExecutionEnvironment;
+import com.netflix.genie.common.internal.dto.v4.JobSpecification;
+import com.netflix.genie.common.internal.jobs.JobConstants;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.context.annotation.Lazy;

diff --git a/genie-agent/src/main/java/com/netflix/genie/agent/utils/PathUtils.java b/genie-agent/src/main/java/com/netflix/genie/agent/utils/PathUtils.java
@@ -18,7 +18,7 @@
 
 package com.netflix.genie.agent.utils;
 
-import com.netflix.genie.common.jobs.JobConstants;
+import com.netflix.genie.common.internal.jobs.JobConstants;
 
 import java.io.File;
 import java.nio.file.Path;

diff --git a/genie-agent/src/test/groovy/com/netflix/genie/agent/cli/ArgumentConvertersSpec.groovy b/genie-agent/src/test/groovy/com/netflix/genie/agent/cli/ArgumentConvertersSpec.groovy
@@ -21,7 +21,7 @@ package com.netflix.genie.agent.cli
 import com.beust.jcommander.IStringConverter
 import com.beust.jcommander.ParameterException
 import com.fasterxml.jackson.databind.JsonNode
-import com.netflix.genie.common.dto.v4.Criterion
+import com.netflix.genie.common.internal.dto.v4.Criterion
 import com.netflix.genie.common.util.GenieObjectMapper
 import com.netflix.genie.test.categories.UnitTest
 import org.assertj.core.util.Sets

diff --git a/genie-agent/src/test/groovy/com/netflix/genie/agent/cli/JobRequestArgumentsImplSpec.groovy b/genie-agent/src/test/groovy/com/netflix/genie/agent/cli/JobRequestArgumentsImplSpec.groovy
@@ -20,7 +20,7 @@ package com.netflix.genie.agent.cli
 
 import com.beust.jcommander.JCommander
 import com.beust.jcommander.ParametersDelegate
-import com.netflix.genie.common.dto.v4.Criterion
+import com.netflix.genie.common.internal.dto.v4.Criterion
 import com.netflix.genie.common.util.GenieObjectMapper
 import com.netflix.genie.test.categories.UnitTest
 import org.junit.experimental.categories.Category

diff --git a/genie-agent/src/test/groovy/com/netflix/genie/agent/cli/JobRequestConverterSpec.groovy b/genie-agent/src/test/groovy/com/netflix/genie/agent/cli/JobRequestConverterSpec.groovy
@@ -19,8 +19,8 @@
 package com.netflix.genie.agent.cli
 
 import com.fasterxml.jackson.databind.JsonNode
-import com.netflix.genie.common.dto.v4.AgentJobRequest
-import com.netflix.genie.common.dto.v4.Criterion
+import com.netflix.genie.common.internal.dto.v4.AgentJobRequest
+import com.netflix.genie.common.internal.dto.v4.Criterion
 import com.netflix.genie.test.categories.UnitTest
 import org.assertj.core.util.Sets
 import org.junit.experimental.categories.Category

diff --git a/genie-agent/src/test/groovy/com/netflix/genie/agent/cli/ResolveJobSpecCommandSpec.groovy b/genie-agent/src/test/groovy/com/netflix/genie/agent/cli/ResolveJobSpecCommandSpec.groovy
@@ -21,8 +21,8 @@ package com.netflix.genie.agent.cli
 import com.fasterxml.jackson.core.JsonProcessingException
 import com.netflix.genie.agent.execution.exceptions.JobSpecificationResolutionException
 import com.netflix.genie.agent.execution.services.AgentJobSpecificationService
-import com.netflix.genie.common.dto.v4.AgentJobRequest
-import com.netflix.genie.common.dto.v4.JobSpecification
+import com.netflix.genie.common.internal.dto.v4.AgentJobRequest
+import com.netflix.genie.common.internal.dto.v4.JobSpecification
 import com.netflix.genie.common.util.GenieObjectMapper
 import org.junit.Rule
 import org.junit.rules.TemporaryFolder

diff --git a/...e-agent/src/test/groovy/com/netflix/genie/agent/execution/ExecutionContextImplSpec.groovy b/...e-agent/src/test/groovy/com/netflix/genie/agent/execution/ExecutionContextImplSpec.groovy
@@ -21,7 +21,7 @@ package com.netflix.genie.agent.execution
 import com.netflix.genie.agent.execution.statemachine.States
 import com.netflix.genie.agent.execution.statemachine.actions.StateAction
 import com.netflix.genie.common.dto.JobStatus
-import com.netflix.genie.common.dto.v4.JobSpecification
+import com.netflix.genie.common.internal.dto.v4.JobSpecification
 import com.netflix.genie.test.categories.UnitTest
 import org.apache.commons.lang3.tuple.Triple
 import org.junit.experimental.categories.Category

diff --git a/.../genie/agent/execution/services/impl/grpc/GRpcAgentJobSpecificationServiceImplSpec.groovy b/.../genie/agent/execution/services/impl/grpc/GRpcAgentJobSpecificationServiceImplSpec.groovy
@@ -20,11 +20,11 @@ package com.netflix.genie.agent.execution.services.impl.grpc
 
 import com.netflix.genie.agent.execution.exceptions.JobSpecificationResolutionException
 import com.netflix.genie.agent.execution.services.AgentJobSpecificationService
-import com.netflix.genie.common.dto.v4.AgentJobRequest
-import com.netflix.genie.common.dto.v4.Criterion
-import com.netflix.genie.common.dto.v4.ExecutionResourceCriteria
-import com.netflix.genie.common.dto.v4.JobMetadata
-import com.netflix.genie.common.dto.v4.JobSpecification
+import com.netflix.genie.common.internal.dto.v4.AgentJobRequest
+import com.netflix.genie.common.internal.dto.v4.Criterion
+import com.netflix.genie.common.internal.dto.v4.ExecutionResourceCriteria
+import com.netflix.genie.common.internal.dto.v4.JobMetadata
+import com.netflix.genie.common.internal.dto.v4.JobSpecification
 import com.netflix.genie.proto.GetJobSpecificationRequest
 import com.netflix.genie.proto.JobSpecificationResponse
 import com.netflix.genie.proto.JobSpecificationServiceError

diff --git a/.../groovy/com/netflix/genie/agent/execution/statemachine/actions/LaunchJobActionSpec.groovy b/.../groovy/com/netflix/genie/agent/execution/statemachine/actions/LaunchJobActionSpec.groovy
@@ -22,7 +22,7 @@ import com.netflix.genie.agent.execution.ExecutionContext
 import com.netflix.genie.agent.execution.exceptions.JobLaunchException
 import com.netflix.genie.agent.execution.services.LaunchJobService
 import com.netflix.genie.agent.execution.statemachine.Events
-import com.netflix.genie.common.dto.v4.JobSpecification
+import com.netflix.genie.common.internal.dto.v4.JobSpecification
 import com.netflix.genie.test.categories.UnitTest
 import org.junit.experimental.categories.Category
 import spock.lang.Specification

diff --git a/...tflix/genie/agent/execution/statemachine/actions/ResolveJobSpecificationActionSpec.groovy b/...tflix/genie/agent/execution/statemachine/actions/ResolveJobSpecificationActionSpec.groovy
@@ -25,9 +25,9 @@ import com.netflix.genie.agent.execution.ExecutionContext
 import com.netflix.genie.agent.execution.exceptions.JobSpecificationResolutionException
 import com.netflix.genie.agent.execution.services.AgentJobSpecificationService
 import com.netflix.genie.agent.execution.statemachine.Events
-import com.netflix.genie.common.dto.v4.AgentJobRequest
-import com.netflix.genie.common.dto.v4.ExecutionEnvironment
-import com.netflix.genie.common.dto.v4.JobSpecification
+import com.netflix.genie.common.internal.dto.v4.AgentJobRequest
+import com.netflix.genie.common.internal.dto.v4.ExecutionEnvironment
+import com.netflix.genie.common.internal.dto.v4.JobSpecification
 import com.netflix.genie.common.util.GenieObjectMapper
 import org.assertj.core.util.Sets
 import org.junit.Rule

diff --git a/...t/groovy/com/netflix/genie/agent/execution/statemachine/actions/SetUpJobActionSpec.groovy b/...t/groovy/com/netflix/genie/agent/execution/statemachine/actions/SetUpJobActionSpec.groovy
@@ -26,9 +26,9 @@ import com.netflix.genie.agent.execution.services.DownloadService
 import com.netflix.genie.agent.execution.statemachine.Events
 import com.netflix.genie.agent.utils.EnvUtils
 import com.netflix.genie.agent.utils.PathUtils
-import com.netflix.genie.common.dto.v4.ExecutionEnvironment
-import com.netflix.genie.common.dto.v4.JobSpecification
-import com.netflix.genie.common.jobs.JobConstants
+import com.netflix.genie.common.internal.dto.v4.ExecutionEnvironment
+import com.netflix.genie.common.internal.dto.v4.JobSpecification
+import com.netflix.genie.common.internal.jobs.JobConstants
 import com.netflix.genie.test.categories.UnitTest
 import org.assertj.core.util.Sets
 import org.junit.Rule

diff --git a/genie-client/build.gradle b/genie-client/build.gradle
@@ -4,6 +4,7 @@ dependencies {
      *******************************/
 
     compile project(":genie-common")
+    compile project(":genie-common-external")
 
     compile("commons-beanutils:commons-beanutils")
     compile("com.squareup.okhttp3:okhttp")

diff --git a/genie-common-external/build.gradle b/genie-common-external/build.gradle
@@ -9,6 +9,8 @@ dependencies {
      * Implementation Dependencies
      *******************************/
 
+     implementation(project(":genie-common"))
+
     /*******************************
      * Provided Dependencies
      *******************************/

diff --git a/genie-common-internal/build.gradle b/genie-common-internal/build.gradle
@@ -9,6 +9,11 @@ dependencies {
      * Implementation Dependencies
      *******************************/
 
+     implementation(project(":genie-common"))
+     implementation(project(":genie-common-external"))
+     implementation(project(":genie-proto"))
+     implementation("org.apache.commons:commons-lang3")
+
     /*******************************
      * Provided Dependencies
      *******************************/

diff --git a/...ommon/dto/v4/AgentEnvironmentRequest.java → ...ernal/dto/v4/AgentEnvironmentRequest.java b/...ommon/dto/v4/AgentEnvironmentRequest.java → ...ernal/dto/v4/AgentEnvironmentRequest.java
@@ -15,7 +15,7 @@
  *     limitations under the License.
  *
  */
-package com.netflix.genie.common.dto.v4;
+package com.netflix.genie.common.internal.dto.v4;
 
 import com.fasterxml.jackson.annotation.JsonSetter;
 import com.fasterxml.jackson.databind.JsonNode;

diff --git a/.../genie/common/dto/v4/AgentJobRequest.java → ...mmon/internal/dto/v4/AgentJobRequest.java b/.../genie/common/dto/v4/AgentJobRequest.java → ...mmon/internal/dto/v4/AgentJobRequest.java
@@ -15,7 +15,7 @@
  *     limitations under the License.
  *
  */
-package com.netflix.genie.common.dto.v4;
+package com.netflix.genie.common.internal.dto.v4;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

diff --git a/...ix/genie/common/dto/v4/ApiJobRequest.java → ...common/internal/dto/v4/ApiJobRequest.java b/...ix/genie/common/dto/v4/ApiJobRequest.java → ...common/internal/dto/v4/ApiJobRequest.java
@@ -15,7 +15,7 @@
  *     limitations under the License.
  *
  */
-package com.netflix.genie.common.dto.v4;
+package com.netflix.genie.common.internal.dto.v4;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

diff --git a/...flix/genie/common/dto/v4/Application.java → ...e/common/internal/dto/v4/Application.java b/...flix/genie/common/dto/v4/Application.java → ...e/common/internal/dto/v4/Application.java
@@ -15,7 +15,7 @@
  *     limitations under the License.
  *
  */
-package com.netflix.genie.common.dto.v4;
+package com.netflix.genie.common.internal.dto.v4;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

diff --git a/...ie/common/dto/v4/ApplicationMetadata.java → .../internal/dto/v4/ApplicationMetadata.java b/...ie/common/dto/v4/ApplicationMetadata.java → .../internal/dto/v4/ApplicationMetadata.java
@@ -15,7 +15,7 @@
  *     limitations under the License.
  *
  */
-package com.netflix.genie.common.dto.v4;
+package com.netflix.genie.common.internal.dto.v4;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

diff --git a/...nie/common/dto/v4/ApplicationRequest.java → ...n/internal/dto/v4/ApplicationRequest.java b/...nie/common/dto/v4/ApplicationRequest.java → ...n/internal/dto/v4/ApplicationRequest.java
@@ -15,7 +15,7 @@
  *     limitations under the License.
  *
  */
-package com.netflix.genie.common.dto.v4;
+package com.netflix.genie.common.internal.dto.v4;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

diff --git a/.../netflix/genie/common/dto/v4/Cluster.java → ...genie/common/internal/dto/v4/Cluster.java b/.../netflix/genie/common/dto/v4/Cluster.java → ...genie/common/internal/dto/v4/Cluster.java
@@ -15,7 +15,7 @@
  *     limitations under the License.
  *
  */
-package com.netflix.genie.common.dto.v4;
+package com.netflix.genie.common.internal.dto.v4;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

diff --git a/.../genie/common/dto/v4/ClusterMetadata.java → ...mmon/internal/dto/v4/ClusterMetadata.java b/.../genie/common/dto/v4/ClusterMetadata.java → ...mmon/internal/dto/v4/ClusterMetadata.java
@@ -15,7 +15,7 @@
  *     limitations under the License.
  *
  */
-package com.netflix.genie.common.dto.v4;
+package com.netflix.genie.common.internal.dto.v4;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

diff --git a/...x/genie/common/dto/v4/ClusterRequest.java → ...ommon/internal/dto/v4/ClusterRequest.java b/...x/genie/common/dto/v4/ClusterRequest.java → ...ommon/internal/dto/v4/ClusterRequest.java
@@ -15,7 +15,7 @@
  *     limitations under the License.
  *
  */
-package com.netflix.genie.common.dto.v4;
+package com.netflix.genie.common.internal.dto.v4;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

diff --git a/.../netflix/genie/common/dto/v4/Command.java → ...genie/common/internal/dto/v4/Command.java b/.../netflix/genie/common/dto/v4/Command.java → ...genie/common/internal/dto/v4/Command.java
@@ -15,7 +15,7 @@
  *     limitations under the License.
  *
  */
-package com.netflix.genie.common.dto.v4;
+package com.netflix.genie.common.internal.dto.v4;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

diff --git a/.../genie/common/dto/v4/CommandMetadata.java → ...mmon/internal/dto/v4/CommandMetadata.java b/.../genie/common/dto/v4/CommandMetadata.java → ...mmon/internal/dto/v4/CommandMetadata.java
@@ -15,7 +15,7 @@
  *     limitations under the License.
  *
  */
-package com.netflix.genie.common.dto.v4;
+package com.netflix.genie.common.internal.dto.v4;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

diff --git a/...x/genie/common/dto/v4/CommandRequest.java → ...ommon/internal/dto/v4/CommandRequest.java b/...x/genie/common/dto/v4/CommandRequest.java → ...ommon/internal/dto/v4/CommandRequest.java
@@ -15,7 +15,7 @@
  *     limitations under the License.
  *
  */
-package com.netflix.genie.common.dto.v4;
+package com.netflix.genie.common.internal.dto.v4;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

diff --git a/...x/genie/common/dto/v4/CommonMetadata.java → ...ommon/internal/dto/v4/CommonMetadata.java b/...x/genie/common/dto/v4/CommonMetadata.java → ...ommon/internal/dto/v4/CommonMetadata.java
@@ -15,7 +15,7 @@
  *     limitations under the License.
  *
  */
-package com.netflix.genie.common.dto.v4;
+package com.netflix.genie.common.internal.dto.v4;
 
 import com.fasterxml.jackson.annotation.JsonSetter;
 import com.fasterxml.jackson.databind.JsonNode;