Skip to content

Commit

Permalink
Merge pull request #1138 from hovsepm/master
Browse files Browse the repository at this point in the history
Fixed Feature client
  • Loading branch information
jianghaolu authored Sep 29, 2016
2 parents 4481626 + ca40ae2 commit 169d2d3
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 72 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
package com.microsoft.azure.management.resources;

import com.microsoft.azure.management.apigeneration.Fluent;
import com.microsoft.azure.management.apigeneration.LangDefinition;
import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingByName;
import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing;

/**
Expand All @@ -18,26 +16,11 @@
public interface Features extends
SupportsListing<Feature> {
/**
* Filter the features by a specific resource provider.
* Registers a feature in a resource provider.
*
* @param resourceProviderName the name of the resource provider
* @return an instance for accessing features in a resource provider
* @param featureName the name of the feature
* @return the immutable client-side feature object created
*/
InResourceProvider resourceProvider(String resourceProviderName);

/**
* Entry point to features management API in a specific resource provider.
*/
@LangDefinition(ContainerName = "~/Feature")
interface InResourceProvider extends
SupportsListing<Feature>,
SupportsGettingByName<Feature> {
/**
* Registers a feature in a resource provider.
*
* @param featureName the name of the feature
* @return the immutable client-side feature object created
*/
Feature register(String featureName);
}
Feature register(String resourceProviderName, String featureName);
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import com.microsoft.azure.PagedList;
import com.microsoft.azure.management.apigeneration.LangDefinition;
import com.microsoft.azure.management.apigeneration.LangDefinition.MethodConversion;
import com.microsoft.azure.management.apigeneration.Method;

/**
* Provides access to listing Azure resources of a specific type in a subscription.
Expand All @@ -25,6 +24,5 @@ public interface SupportsListing<T> {
*
* @return list of resources
*/
@Method
PagedList<T> list();
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ public PagedList<Feature> list() {
}

@Override
public InResourceProvider resourceProvider(String resourceProviderName) {
return null;
public Feature register(String resourceProviderName, String featureName) {
return wrapModel(client.register(resourceProviderName, featureName));
}

@Override
Expand Down

This file was deleted.

0 comments on commit 169d2d3

Please sign in to comment.