Skip to content

Commit

Permalink
removing generated resourcehandlers
Browse files Browse the repository at this point in the history
- deprecated methods dealing with CustomResources, and added resources
methods where appropriate.  This means that nearly every method on
sharedinformerfactory is now deprecated
- replaced CustomResourceDefinitionContext with
ResourceDefinitionContext in the api where appropriate
- what were generated handlers are now obtained through Handlers methods
- passing the type/listType to the base HasMetadataOperation to validate
that the operation is registered
- moved OperationImpl registration onto the ExtensionAdapters
  • Loading branch information
shawkins committed Jul 23, 2021
1 parent 93d3f01 commit 7037b9f
Show file tree
Hide file tree
Showing 181 changed files with 1,205 additions and 3,887 deletions.
7 changes: 1 addition & 6 deletions extensions/camel-k/client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,6 @@
osgi.extender;
filter:="(osgi.extender=osgi.serviceloader.registrar)"
</osgi.require-capability>
<osgi.provide-capability>
osgi.serviceloader;
osgi.serviceloader=io.fabric8.kubernetes.client.ResourceHandler
</osgi.provide-capability>
<osgi.import>
io.fabric8.kubernetes.api.builder,
!io.fabric8.camelk.client.*,
Expand All @@ -46,8 +42,7 @@
io.fabric8.camelk.client.*
</osgi.export>
<osgi.include.resources>
/META-INF/services/io.fabric8.kubernetes.client.ExtensionAdapter=target/classes/META-INF/services/io.fabric8.kubernetes.client.ExtensionAdapter,
/META-INF/services/io.fabric8.kubernetes.client.ResourceHandler=target/classes/META-INF/services/io.fabric8.kubernetes.client.ResourceHandler
/META-INF/services/io.fabric8.kubernetes.client.ExtensionAdapter=target/classes/META-INF/services/io.fabric8.kubernetes.client.ExtensionAdapter
</osgi.include.resources>
</properties>

Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,7 @@
*/
package io.fabric8.camelk.client;

import io.fabric8.kubernetes.client.BaseClient;
import io.fabric8.kubernetes.client.Config;
import io.fabric8.kubernetes.client.dsl.MixedOperation;
import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
import io.fabric8.kubernetes.client.dsl.Resource;
import io.fabric8.camelk.client.dsl.V1APIGroupDSL;
import io.fabric8.camelk.client.internal.v1.BuildOperationsImpl;
import io.fabric8.camelk.client.internal.v1.CamelCatalogOperationsImpl;
import io.fabric8.camelk.client.internal.v1.IntegrationKitOperationsImpl;
import io.fabric8.camelk.client.internal.v1.IntegrationOperationsImpl;
import io.fabric8.camelk.client.internal.v1.IntegrationPlatformOperationsImpl;
import io.fabric8.camelk.v1.Build;
import io.fabric8.camelk.v1.BuildList;
import io.fabric8.camelk.v1.CamelCatalog;
Expand All @@ -36,6 +26,11 @@
import io.fabric8.camelk.v1.IntegrationList;
import io.fabric8.camelk.v1.IntegrationPlatform;
import io.fabric8.camelk.v1.IntegrationPlatformList;
import io.fabric8.kubernetes.client.BaseClient;
import io.fabric8.kubernetes.client.Config;
import io.fabric8.kubernetes.client.Handlers;
import io.fabric8.kubernetes.client.dsl.MixedOperation;
import io.fabric8.kubernetes.client.dsl.Resource;
import okhttp3.OkHttpClient;

public class V1APIGroupClient extends BaseClient implements V1APIGroupDSL {
Expand All @@ -49,27 +44,27 @@ public V1APIGroupClient(OkHttpClient httpClient, final Config config) {

@Override
public MixedOperation<Build, BuildList, Resource<Build>> builds() {
return new BuildOperationsImpl(httpClient, getConfiguration());
return Handlers.getOperation(Build.class, BuildList.class, httpClient, getConfiguration());
}

@Override
public MixedOperation<CamelCatalog, CamelCatalogList, Resource<CamelCatalog>> camelCatalogs() {
return new CamelCatalogOperationsImpl(httpClient, getConfiguration());
return Handlers.getOperation(CamelCatalog.class, CamelCatalogList.class, httpClient, getConfiguration());
}

@Override
public MixedOperation<Integration, IntegrationList, Resource<Integration>> integrations() {
return new IntegrationOperationsImpl(httpClient, getConfiguration());
return Handlers.getOperation(Integration.class, IntegrationList.class, httpClient, getConfiguration());
}

@Override
public MixedOperation<IntegrationKit, IntegrationKitList, Resource<IntegrationKit>> integrationKits() {
return new IntegrationKitOperationsImpl(httpClient, getConfiguration());
return Handlers.getOperation(IntegrationKit.class, IntegrationKitList.class, httpClient, getConfiguration());
}

@Override
public MixedOperation<IntegrationPlatform, IntegrationPlatformList, Resource<IntegrationPlatform>> integrationPlatforms() {
return new IntegrationPlatformOperationsImpl(httpClient, getConfiguration());
return Handlers.getOperation(IntegrationPlatform.class, IntegrationPlatformList.class, httpClient, getConfiguration());
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
*/
package io.fabric8.camelk.client;

import io.fabric8.camelk.client.dsl.V1alpha1APIGroupDSL;
import io.fabric8.camelk.v1alpha1.Kamelet;
import io.fabric8.camelk.v1alpha1.KameletList;
import io.fabric8.kubernetes.client.BaseClient;
import io.fabric8.kubernetes.client.Config;
import io.fabric8.kubernetes.client.Handlers;
import io.fabric8.kubernetes.client.dsl.MixedOperation;
import io.fabric8.kubernetes.client.dsl.Resource;
import io.fabric8.camelk.client.dsl.V1alpha1APIGroupDSL;
import io.fabric8.camelk.client.internal.v1alpha1.KameletOperationsImpl;
import io.fabric8.camelk.v1alpha1.Kamelet;
import io.fabric8.camelk.v1alpha1.KameletList;
import okhttp3.OkHttpClient;

public class V1alpha1APIGroupClient extends BaseClient implements V1alpha1APIGroupDSL {
Expand All @@ -37,6 +37,6 @@ public V1alpha1APIGroupClient(OkHttpClient httpClient, final Config config) {

@Override
public MixedOperation<Kamelet, KameletList, Resource<Kamelet>> kamelets() {
return new KameletOperationsImpl(httpClient, getConfiguration());
return Handlers.getOperation(Kamelet.class, KameletList.class, httpClient, getConfiguration());
}
}

This file was deleted.

67 changes: 0 additions & 67 deletions extensions/camel-k/client/src/main/resources/resource-handler.vm

This file was deleted.

84 changes: 0 additions & 84 deletions extensions/camel-k/client/src/main/resources/resource-operation.vm

This file was deleted.

7 changes: 1 addition & 6 deletions extensions/certmanager/client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,6 @@
osgi.extender;
filter:="(osgi.extender=osgi.serviceloader.registrar)"
</osgi.require-capability>
<osgi.provide-capability>
osgi.serviceloader;
osgi.serviceloader=io.fabric8.kubernetes.client.ResourceHandler
</osgi.provide-capability>
<osgi.import>
io.fabric8.kubernetes.api.builder,
!io.fabric8.certmanager.client.*,
Expand All @@ -47,8 +43,7 @@
io.fabric8.certmanager.client.*
</osgi.export>
<osgi.include.resources>
/META-INF/services/io.fabric8.kubernetes.client.ExtensionAdapter=target/classes/META-INF/services/io.fabric8.kubernetes.client.ExtensionAdapter,
/META-INF/services/io.fabric8.kubernetes.client.ResourceHandler=target/classes/META-INF/services/io.fabric8.kubernetes.client.ResourceHandler
/META-INF/services/io.fabric8.kubernetes.client.ExtensionAdapter=target/classes/META-INF/services/io.fabric8.kubernetes.client.ExtensionAdapter
</osgi.include.resources>
</properties>

Expand Down

This file was deleted.

0 comments on commit 7037b9f

Please sign in to comment.