Use apiGroupName in generated package for OpenShiftClient Handler/Ope…

…rationsImpl

Right now all OpenShiftClient's Handler/OperationsImpl classes get
generated in one package `io.fabric8.openshift.client.handlers`/`io.fabric8.openshift.client.dsl.internal`

This creates problems if we want to provide handlers for resources with
same names but from different packages. Hence, we should use apiGroup
name in packages in order to segregate handlers/operations classes as
per their respective apiGroup

CHANGELOG.md

@@ -30,6 +30,7 @@
 * Fix #3057: Removed debug calls for CustomResource during deserialization
 * Fix #3050: More enforcement of the informer lifecycle
 * Fix #3061: Removed the deltafifo from the informer logic
+* Use apiGroupName in generated package for OpenShiftClient Handler/OperationsImpl classes
 
 #### Dependency Upgrade
 * Fix #2979: Update Kubernetes Model to v1.21.0

openshift-client/src/main/java/io/fabric8/openshift/client/DefaultOpenShiftClient.java

@@ -184,31 +184,31 @@
 import io.fabric8.openshift.client.dsl.ProjectOperation;
 import io.fabric8.openshift.client.dsl.ProjectRequestOperation;
 import io.fabric8.openshift.client.dsl.TemplateResource;
-import io.fabric8.openshift.client.dsl.internal.BuildConfigOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.BuildOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.ClusterNetworkOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.ClusterRoleBindingOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.DeploymentConfigOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.EgressNetworkPolicyOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.GroupOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.ImageOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.ImageStreamOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.ImageStreamTagOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.ImageTagOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.NetNamespaceOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.OAuthAccessTokenOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.OAuthAuthorizeTokenOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.OAuthClientOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.build.BuildConfigOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.build.BuildOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.network.ClusterNetworkOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.authorization.ClusterRoleBindingOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.apps.DeploymentConfigOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.network.EgressNetworkPolicyOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.user.GroupOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.image.ImageOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.image.ImageStreamOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.image.ImageStreamTagOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.image.ImageTagOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.network.NetNamespaceOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.oauth.OAuthAccessTokenOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.oauth.OAuthAuthorizeTokenOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.oauth.OAuthClientOperationsImpl;
 import io.fabric8.openshift.client.dsl.internal.OpenShiftSubjectAccessReviewOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.ProjectOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.project.ProjectOperationsImpl;
 import io.fabric8.openshift.client.dsl.internal.ProjectRequestsOperationImpl;
-import io.fabric8.openshift.client.dsl.internal.RangeAllocationOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.RoleBindingOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.RoleOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.RouteOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.SecurityContextConstraintsOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.TemplateOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.UserOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.security.RangeAllocationOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.authorization.RoleBindingOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.authorization.RoleOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.route.RouteOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.security.SecurityContextConstraintsOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.core.TemplateOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.user.UserOperationsImpl;
 import io.fabric8.openshift.client.internal.OpenShiftClusterOperationsImpl;
 import io.fabric8.openshift.client.internal.OpenShiftNamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicableListImpl;
 import io.fabric8.openshift.client.internal.OpenShiftOAuthInterceptor;

openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftConfigAPIGroupClient.java

@@ -40,16 +40,16 @@
 import io.fabric8.openshift.api.model.Scheduler;
 import io.fabric8.openshift.api.model.SchedulerList;
 import io.fabric8.openshift.client.dsl.OpenShiftConfigAPIGroupDSL;
-import io.fabric8.openshift.client.dsl.internal.APIServerOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.ClusterOperatorOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.ClusterVersionOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.FeatureGateOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.InfrastructureOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.OAuthOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.OperatorHubOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.ProxyOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.IngressOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.SchedulerOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.config.APIServerOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.config.ClusterOperatorOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.config.ClusterVersionOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.config.FeatureGateOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.config.InfrastructureOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.config.OAuthOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.config.OperatorHubOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.config.ProxyOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.config.IngressOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.config.SchedulerOperationsImpl;
 import okhttp3.OkHttpClient;
 
 public class OpenShiftConfigAPIGroupClient extends BaseClient implements OpenShiftConfigAPIGroupDSL {

openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftConsoleAPIGroupClient.java

@@ -30,11 +30,11 @@
 import io.fabric8.openshift.api.model.console.v1.ConsoleYAMLSample;
 import io.fabric8.openshift.api.model.console.v1.ConsoleYAMLSampleList;
 import io.fabric8.openshift.client.dsl.OpenShiftConsoleAPIGroupDSL;
-import io.fabric8.openshift.client.dsl.internal.ConsoleCLIDownloadOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.ConsoleExternalLogLinkOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.ConsoleLinkOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.ConsoleNotificationOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.ConsoleYAMLSampleOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.console.ConsoleCLIDownloadOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.console.ConsoleExternalLogLinkOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.console.ConsoleLinkOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.console.ConsoleNotificationOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.console.ConsoleYAMLSampleOperationsImpl;
 import okhttp3.OkHttpClient;
 
 public class OpenShiftConsoleAPIGroupClient extends BaseClient implements OpenShiftConsoleAPIGroupDSL {

openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftMonitoringAPIGroupClient.java

@@ -30,11 +30,11 @@
 import io.fabric8.openshift.api.model.monitoring.v1.ServiceMonitor;
 import io.fabric8.openshift.api.model.monitoring.v1.ServiceMonitorList;
 import io.fabric8.openshift.client.dsl.OpenShiftMonitoringAPIGroupDSL;
-import io.fabric8.openshift.client.dsl.internal.AlertmanagerOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.PodMonitorOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.PrometheusOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.PrometheusRuleOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.ServiceMonitorOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.monitoring.coreos.AlertmanagerOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.monitoring.coreos.PodMonitorOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.monitoring.coreos.PrometheusOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.monitoring.coreos.PrometheusRuleOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.monitoring.coreos.ServiceMonitorOperationsImpl;
 import okhttp3.OkHttpClient;
 
 public class OpenShiftMonitoringAPIGroupClient extends BaseClient implements OpenShiftMonitoringAPIGroupDSL {

openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftOperatorAPIGroupClient.java

@@ -59,25 +59,25 @@
 import io.fabric8.openshift.api.model.operator.v1alpha1.ImageContentSourcePolicy;
 import io.fabric8.openshift.api.model.operator.v1alpha1.ImageContentSourcePolicyList;
 import io.fabric8.openshift.client.dsl.OpenShiftOperatorAPIGroupDSL;
-import io.fabric8.openshift.client.dsl.internal.AuthenticationOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.CSISnapshotControllerOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.ConsoleOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.DNSOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.DNSRecordOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.EtcdOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.ImageContentSourcePolicyOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.ImagePrunerOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.IngressControllerOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.KubeAPIServerOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.KubeControllerManagerOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.KubeSchedulerOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.KubeStorageVersionMigratorOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.NetworkOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.OpenShiftAPIServerOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.OpenShiftControllerManagerOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.ServiceCAOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.ServiceCatalogAPIServerOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.ServiceCatalogControllerManagerOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.operator.AuthenticationOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.operator.CSISnapshotControllerOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.operator.ConsoleOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.operator.DNSOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.ingress.operator.DNSRecordOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.operator.EtcdOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.operator.ImageContentSourcePolicyOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.imageregistry.operator.ImagePrunerOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.operator.IngressControllerOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.operator.KubeAPIServerOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.operator.KubeControllerManagerOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.operator.KubeSchedulerOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.operator.KubeStorageVersionMigratorOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.operator.NetworkOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.operator.OpenShiftAPIServerOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.operator.OpenShiftControllerManagerOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.operator.ServiceCAOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.operator.ServiceCatalogAPIServerOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.operator.ServiceCatalogControllerManagerOperationsImpl;
 import okhttp3.OkHttpClient;
 
 public class OpenShiftOperatorAPIGroupClient extends BaseClient implements OpenShiftOperatorAPIGroupDSL {

openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftOperatorHubAPIGroupClient.java

@@ -30,11 +30,11 @@
 import io.fabric8.openshift.api.model.operatorhub.v1alpha1.Subscription;
 import io.fabric8.openshift.api.model.operatorhub.v1alpha1.SubscriptionList;
 import io.fabric8.openshift.client.dsl.OpenShiftOperatorHubAPIGroupDSL;
-import io.fabric8.openshift.client.dsl.internal.CatalogSourceOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.ClusterServiceVersionOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.InstallPlanOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.OperatorGroupOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.SubscriptionOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.operators.coreos.CatalogSourceOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.operators.coreos.ClusterServiceVersionOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.operators.coreos.InstallPlanOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.operators.coreos.OperatorGroupOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.operators.coreos.SubscriptionOperationsImpl;
 import okhttp3.OkHttpClient;
 
 public class OpenShiftOperatorHubAPIGroupClient extends BaseClient implements OpenShiftOperatorHubAPIGroupDSL {

openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftQuotaAPIGroupClient.java

@@ -24,8 +24,8 @@
 import io.fabric8.openshift.api.model.ClusterResourceQuota;
 import io.fabric8.openshift.api.model.ClusterResourceQuotaList;
 import io.fabric8.openshift.client.dsl.OpenShiftQuotaAPIGroupDSL;
-import io.fabric8.openshift.client.dsl.internal.AppliedClusterResourceQuotaOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.ClusterResourceQuotaOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.quota.AppliedClusterResourceQuotaOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.quota.ClusterResourceQuotaOperationsImpl;
 import okhttp3.OkHttpClient;
 
 public class OpenShiftQuotaAPIGroupClient extends BaseClient implements OpenShiftQuotaAPIGroupDSL {

openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/DeploymentConfigOperationsImpl.java → openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/apps/DeploymentConfigOperationsImpl.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.openshift.client.dsl.internal;
+package io.fabric8.openshift.client.dsl.internal.apps;
 
 import io.fabric8.kubernetes.api.builder.Visitor;
 import io.fabric8.kubernetes.api.model.Pod;
@@ -27,6 +27,7 @@
 import io.fabric8.kubernetes.client.utils.PodOperationUtil;
 import io.fabric8.kubernetes.client.dsl.internal.RollingOperationContext;
 import io.fabric8.kubernetes.client.utils.URLUtils;
+import io.fabric8.openshift.client.dsl.internal.OpenShiftOperation;
 import okhttp3.HttpUrl;
 import okhttp3.Request;
 import okhttp3.Response;

openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/ClusterRoleBindingOperationsImpl.java → openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/authorization/ClusterRoleBindingOperationsImpl.java

@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.openshift.client.dsl.internal;
+package io.fabric8.openshift.client.dsl.internal.authorization;
 
 import io.fabric8.kubernetes.api.builder.Visitor;
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.kubernetes.client.dsl.base.OperationContext;
+import io.fabric8.openshift.client.dsl.internal.OpenShiftOperation;
 import okhttp3.OkHttpClient;
 import io.fabric8.openshift.api.model.ClusterRoleBinding;
 import io.fabric8.openshift.api.model.ClusterRoleBindingBuilder;

openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/RoleBindingOperationsImpl.java → openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/authorization/RoleBindingOperationsImpl.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.openshift.client.dsl.internal;
+package io.fabric8.openshift.client.dsl.internal.authorization;
 
 import io.fabric8.kubernetes.api.builder.Visitor;
 import io.fabric8.kubernetes.api.builder.TypedVisitor;
@@ -25,6 +25,7 @@
 import io.fabric8.openshift.api.model.RoleBindingBuilder;
 import io.fabric8.openshift.api.model.RoleBindingList;
 import io.fabric8.openshift.client.OpenShiftConfig;
+import io.fabric8.openshift.client.dsl.internal.OpenShiftOperation;
 import okhttp3.OkHttpClient;
 
 import java.io.IOException;

openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/RoleOperationsImpl.java → openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/authorization/RoleOperationsImpl.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.openshift.client.dsl.internal;
+package io.fabric8.openshift.client.dsl.internal.authorization;
 
 import io.fabric8.kubernetes.api.builder.Visitor;
 import io.fabric8.kubernetes.client.dsl.Resource;
@@ -22,6 +22,7 @@
 import io.fabric8.openshift.api.model.RoleBuilder;
 import io.fabric8.openshift.api.model.RoleList;
 import io.fabric8.openshift.client.OpenShiftConfig;
+import io.fabric8.openshift.client.dsl.internal.OpenShiftOperation;
 import okhttp3.OkHttpClient;
 
 import static io.fabric8.openshift.client.OpenShiftAPIGroups.AUTHORIZATION;

openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/BuildConfigOperationsImpl.java → openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/build/BuildConfigOperationsImpl.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.openshift.client.dsl.internal;
+package io.fabric8.openshift.client.dsl.internal.build;
 
 import io.fabric8.kubernetes.api.builder.Visitor;
 import io.fabric8.kubernetes.api.model.Event;
@@ -45,6 +45,8 @@
 import io.fabric8.openshift.client.dsl.buildconfig.CommitterAuthorMessageAsFileTimeoutInputStreamable;
 import io.fabric8.openshift.client.dsl.buildconfig.CommitterEmailable;
 import io.fabric8.openshift.client.dsl.buildconfig.MessageAsFileTimeoutInputStreamable;
+import io.fabric8.openshift.client.dsl.internal.BuildConfigOperationContext;
+import io.fabric8.openshift.client.dsl.internal.OpenShiftOperation;
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;

openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/BuildOperationsImpl.java → openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/build/BuildOperationsImpl.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.openshift.client.dsl.internal;
+package io.fabric8.openshift.client.dsl.internal.build;
 
 import io.fabric8.kubernetes.api.builder.Visitor;
 import io.fabric8.kubernetes.api.model.Pod;
@@ -31,6 +31,8 @@
 import io.fabric8.kubernetes.client.internal.PatchUtils;
 import io.fabric8.kubernetes.client.utils.URLUtils;
 import io.fabric8.openshift.client.dsl.BuildResource;
+import io.fabric8.openshift.client.dsl.internal.BuildOperationContext;
+import io.fabric8.openshift.client.dsl.internal.OpenShiftOperation;
 import io.fabric8.openshift.client.internal.patchmixins.BuildMixIn;
 import okhttp3.OkHttpClient;
 import io.fabric8.openshift.api.model.Build;

openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/TemplateOperationsImpl.java → openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/core/TemplateOperationsImpl.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.openshift.client.dsl.internal;
+package io.fabric8.openshift.client.dsl.internal.core;
 
 import io.fabric8.kubernetes.api.builder.Visitor;
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -36,6 +36,8 @@
 import io.fabric8.openshift.client.ParameterValue;
 import io.fabric8.openshift.client.dsl.TemplateOperation;
 import io.fabric8.openshift.client.dsl.TemplateResource;
+import io.fabric8.openshift.client.dsl.internal.OpenShiftOperation;
+import io.fabric8.openshift.client.dsl.internal.TemplateOperationContext;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.RequestBody;

openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/OAuthAccessTokenOperationsImpl.java → openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/oauth/OAuthAccessTokenOperationsImpl.java

@@ -13,10 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.openshift.client.dsl.internal;
+package io.fabric8.openshift.client.dsl.internal.oauth;
 
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.kubernetes.client.dsl.base.OperationContext;
+import io.fabric8.openshift.client.dsl.internal.OpenShiftOperation;
 import okhttp3.OkHttpClient;
 import io.fabric8.openshift.api.model.OAuthAccessToken;
 import io.fabric8.openshift.api.model.OAuthAccessTokenList;