Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding api annotations to graph and keyvault #1091

Merged
merged 1 commit into from
Sep 23, 2016
Merged

Adding api annotations to graph and keyvault #1091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion azure-mgmt-graph-rbac/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,6 @@
</compilerArguments>
</configuration>
</plugin>

</plugins>
</build>
</project>
6 changes: 6 additions & 0 deletions ...aph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/ActiveDirectoryGroup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@

package com.microsoft.azure.management.graphrbac;

import com.microsoft.azure.management.apigeneration.LangDefinition;
import com.microsoft.azure.management.graphrbac.implementation.ADGroupInner;
import com.microsoft.azure.management.resources.fluentcore.model.Creatable;
import com.microsoft.azure.management.resources.fluentcore.model.Wrapper;

/**
* An immutable client-side representation of an Azure AD group.
*/
@LangDefinition
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note we now have a simplified annotations approach: just use @fluent() at the top interface and nothing else is needed. The embedded interfaces will be processed automatically - no need to annotate them (per Alva).
The LangDefinition imports can simply be all removed.

public interface ActiveDirectoryGroup extends
Wrapper<ADGroupInner> {
/**
Expand Down Expand Up @@ -47,6 +49,7 @@ public interface ActiveDirectoryGroup extends
/**
* Container interface for all the definitions that need to be implemented.
*/
@LangDefinition(ContainerName = "~/ActiveDirectoryGroup.Definition", ContainerFileName = "IDefinition")
interface Definition extends
DefinitionStages.Blank,
DefinitionStages.WithDisplayName,
Expand All @@ -57,6 +60,7 @@ interface Definition extends
/**
* Grouping of all the group definition stages.
*/
@LangDefinition(ContainerName = "~/ActiveDirectoryGroup.Definition", ContainerFileName = "IDefinition", IsContainerOnly = true)
interface DefinitionStages {
/**
* The first stage of the group definition.
Expand Down Expand Up @@ -103,12 +107,14 @@ interface WithCreate extends
/**
* Grouping of all the group update stages.
*/
@LangDefinition(ContainerName = "~/ActiveDirectoryGroup.Update", ContainerFileName = "IUpdate", IsContainerOnly = true)
interface UpdateStages {
}

/**
* The template for a group update operation, containing all the settings that can be modified.
*/
@LangDefinition(ContainerName = "~/ActiveDirectoryGroup.Update", ContainerFileName = "IUpdate")
interface Update {
}
}
2 changes: 2 additions & 0 deletions azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/Groups.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
package com.microsoft.azure.management.graphrbac;

import com.microsoft.azure.CloudException;
import com.microsoft.azure.management.apigeneration.LangDefinition;
import com.microsoft.azure.management.resources.fluentcore.collection.SupportsCreating;
import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeleting;
import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing;
Expand All @@ -17,6 +18,7 @@
/**
* Entry point to AD group management API.
*/
@LangDefinition(ContainerName = "~/")
public interface Groups extends
SupportsCreating<ActiveDirectoryGroup.DefinitionStages.Blank>,
SupportsListing<ActiveDirectoryGroup>,
Expand Down
6 changes: 6 additions & 0 deletions ...t-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/ServicePrincipal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

package com.microsoft.azure.management.graphrbac;

import com.microsoft.azure.management.apigeneration.LangDefinition;
import com.microsoft.azure.management.graphrbac.implementation.ServicePrincipalInner;
import com.microsoft.azure.management.resources.fluentcore.model.Creatable;
import com.microsoft.azure.management.resources.fluentcore.model.Wrapper;
Expand All @@ -15,6 +16,7 @@
/**
* An immutable client-side representation of an Azure AD service principal.
*/
@LangDefinition
public interface ServicePrincipal extends
Wrapper<ServicePrincipalInner> {
/**
Expand Down Expand Up @@ -49,6 +51,7 @@ public interface ServicePrincipal extends
/**
* Container interface for all the definitions that need to be implemented.
*/
@LangDefinition(ContainerName = "~/ServicePrincipal.Definition", ContainerFileName = "IDefinition")
interface Definition extends
DefinitionStages.Blank,
DefinitionStages.WithCreate {
Expand All @@ -57,6 +60,7 @@ interface Definition extends
/**
* Grouping of all the service principal definition stages.
*/
@LangDefinition(ContainerName = "~/ServicePrincipal.Definition", ContainerFileName = "IDefinition", IsContainerOnly = true)
interface DefinitionStages {
/**
* The first stage of the service principal definition.
Expand Down Expand Up @@ -91,12 +95,14 @@ interface WithCreate extends
/**
* Grouping of all the service principal update stages.
*/
@LangDefinition(ContainerName = "~/ServicePrincipal.Update", ContainerFileName = "IUpdate", IsContainerOnly = true)
interface UpdateStages {
}

/**
* The template for a service principal update operation, containing all the settings that can be modified.
*/
@LangDefinition(ContainerName = "~/ServicePrincipal.Update", ContainerFileName = "IUpdate")
interface Update {
}
}
2 changes: 2 additions & 0 deletions ...-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/ServicePrincipals.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

package com.microsoft.azure.management.graphrbac;

import com.microsoft.azure.management.apigeneration.LangDefinition;
import com.microsoft.azure.management.resources.fluentcore.collection.SupportsCreating;
import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeleting;
import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing;
Expand All @@ -16,6 +17,7 @@
/**
* Entry point to service principal management API.
*/
@LangDefinition(ContainerName = "~/")
public interface ServicePrincipals extends
SupportsCreating<ServicePrincipal.DefinitionStages.Blank>,
SupportsListing<ServicePrincipal>,
Expand Down
6 changes: 6 additions & 0 deletions azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/User.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@

package com.microsoft.azure.management.graphrbac;

import com.microsoft.azure.management.apigeneration.LangDefinition;
import com.microsoft.azure.management.graphrbac.implementation.UserInner;
import com.microsoft.azure.management.resources.fluentcore.model.Creatable;
import com.microsoft.azure.management.resources.fluentcore.model.Wrapper;

/**
* An immutable client-side representation of an Azure AD user.
*/
@LangDefinition
public interface User extends
Wrapper<UserInner> {

Expand Down Expand Up @@ -58,6 +60,7 @@ public interface User extends
/**
* Container interface for all the definitions that need to be implemented.
*/
@LangDefinition(ContainerName = "~/User.Definition", ContainerFileName = "IDefinition")
interface Definition extends
DefinitionStages.Blank,
DefinitionStages.WithDisplayName,
Expand All @@ -69,6 +72,7 @@ interface Definition extends
/**
* Grouping of all the user definition stages.
*/
@LangDefinition(ContainerName = "~/User.Definition", ContainerFileName = "IDefinition", IsContainerOnly = true)
interface DefinitionStages {
/**
* The first stage of the user definition.
Expand Down Expand Up @@ -151,12 +155,14 @@ interface WithCreate extends
/**
* Grouping of all the user update stages.
*/
@LangDefinition(ContainerName = "~/User.Update", ContainerFileName = "IUpdate", IsContainerOnly = true)
interface UpdateStages {
}

/**
* The template for a user update operation, containing all the settings that can be modified.
*/
@LangDefinition(ContainerName = "~/User.Update", ContainerFileName = "IUpdate")
interface Update {
}
}
2 changes: 2 additions & 0 deletions azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/Users.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

package com.microsoft.azure.management.graphrbac;

import com.microsoft.azure.management.apigeneration.LangDefinition;
import com.microsoft.azure.management.resources.fluentcore.collection.SupportsCreating;
import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeleting;
import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing;
Expand All @@ -16,6 +17,7 @@
/**
* Entry point to AD user management API.
*/
@LangDefinition(ContainerName = "~/")
public interface Users extends
SupportsCreating<User.DefinitionStages.Blank>,
SupportsListing<User>,
Expand Down
2 changes: 2 additions & 0 deletions ...in/java/com/microsoft/azure/management/graphrbac/implementation/ServicePrincipalImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

package com.microsoft.azure.management.graphrbac.implementation;

import com.microsoft.azure.management.apigeneration.LangDefinition;
import com.microsoft.azure.management.graphrbac.ServicePrincipal;
import com.microsoft.azure.management.resources.fluentcore.model.implementation.CreatableUpdatableImpl;
import rx.Observable;
Expand All @@ -15,6 +16,7 @@
/**
* Implementation for ServicePrincipal and its parent interfaces.
*/
@LangDefinition
class ServicePrincipalImpl
extends CreatableUpdatableImpl<ServicePrincipal, ServicePrincipalInner, ServicePrincipalImpl>
implements
Expand Down
2 changes: 2 additions & 0 deletions ...n/java/com/microsoft/azure/management/graphrbac/implementation/ServicePrincipalsImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

import com.microsoft.azure.Page;
import com.microsoft.azure.PagedList;
import com.microsoft.azure.management.apigeneration.LangDefinition;
import com.microsoft.azure.management.graphrbac.GraphErrorException;
import com.microsoft.azure.management.graphrbac.ServicePrincipal;
import com.microsoft.azure.management.graphrbac.ServicePrincipals;
Expand All @@ -23,6 +24,7 @@
/**
* The implementation of ServicePrincipals and its parent interfaces.
*/
@LangDefinition
class ServicePrincipalsImpl
extends CreatableWrappersImpl<
ServicePrincipal,
Expand Down
2 changes: 2 additions & 0 deletions ...-rbac/src/main/java/com/microsoft/azure/management/graphrbac/implementation/UserImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

package com.microsoft.azure.management.graphrbac.implementation;

import com.microsoft.azure.management.apigeneration.LangDefinition;
import com.microsoft.azure.management.graphrbac.PasswordProfile;
import com.microsoft.azure.management.graphrbac.User;
import com.microsoft.azure.management.resources.fluentcore.model.implementation.CreatableUpdatableImpl;
Expand All @@ -14,6 +15,7 @@
/**
* Implementation for User and its parent interfaces.
*/
@LangDefinition
class UserImpl
extends CreatableUpdatableImpl<User, UserInner, UserImpl>
implements
Expand Down
2 changes: 2 additions & 0 deletions ...rbac/src/main/java/com/microsoft/azure/management/graphrbac/implementation/UsersImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
package com.microsoft.azure.management.graphrbac.implementation;

import com.microsoft.azure.PagedList;
import com.microsoft.azure.management.apigeneration.LangDefinition;
import com.microsoft.azure.management.graphrbac.User;
import com.microsoft.azure.management.graphrbac.Users;
import com.microsoft.azure.management.resources.fluentcore.arm.collection.implementation.CreatableWrappersImpl;
Expand All @@ -19,6 +20,7 @@
/**
* The implementation of Users and its parent interfaces.
*/
@LangDefinition
class UsersImpl
extends CreatableWrappersImpl<
User,
Expand Down
1 change: 0 additions & 1 deletion azure-mgmt-keyvault/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,6 @@
</compilerArguments>
</configuration>
</plugin>

</plugins>
</build>
</project>
8 changes: 8 additions & 0 deletions azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/AccessPolicy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

package com.microsoft.azure.management.keyvault;

import com.microsoft.azure.management.apigeneration.LangDefinition;
import com.microsoft.azure.management.graphrbac.ActiveDirectoryGroup;
import com.microsoft.azure.management.graphrbac.ServicePrincipal;
import com.microsoft.azure.management.graphrbac.User;
Expand All @@ -20,6 +21,7 @@
/**
* An immutable client-side representation of a key vault access policy.
*/
@LangDefinition()
public interface AccessPolicy extends
ChildResource<Vault>,
Wrapper<AccessPolicyEntry> {
Expand Down Expand Up @@ -53,6 +55,7 @@ public interface AccessPolicy extends
* The entirety of an access policy definition.
* @param <ParentT> the return type of the final {@link Attachable#attach()}
*/
@LangDefinition(ContainerName = "~/AccessPolicy.Definition", ContainerFileName = "IDefinition")
interface Definition<ParentT> extends
DefinitionStages.Blank<ParentT>,
DefinitionStages.WithAttach<ParentT> {
Expand All @@ -61,6 +64,7 @@ interface Definition<ParentT> extends
/**
* Grouping of access policy definition stages applicable as part of a key vault creation.
*/
@LangDefinition(ContainerName = "~/AccessPolicy.Definition", ContainerFileName = "IDefinition", IsContainerOnly = true)
interface DefinitionStages {
/**
* The first stage of an access policy definition.
Expand Down Expand Up @@ -193,6 +197,7 @@ interface WithAttach<ParentT> extends
* The entirety of an access policy definition as part of a key vault update.
* @param <ParentT> the return type of the final {@link UpdateDefinitionStages.WithAttach#attach()}
*/
@LangDefinition(ContainerName = "~/AccessPolicy.UpdateDefinition", ContainerFileName = "IUpdateDefinition")
interface UpdateDefinition<ParentT> extends
UpdateDefinitionStages.Blank<ParentT>,
UpdateDefinitionStages.WithAttach<ParentT> {
Expand All @@ -201,6 +206,7 @@ interface UpdateDefinition<ParentT> extends
/**
* Grouping of access policy definition stages applicable as part of a key vault update.
*/
@LangDefinition(ContainerName = "~/AccessPolicy.UpdateDefinition", ContainerFileName = "IUpdateDefinition", IsContainerOnly = true)
interface UpdateDefinitionStages {
/**
* The first stage of an access policy definition.
Expand Down Expand Up @@ -332,6 +338,7 @@ interface WithAttach<ParentT> extends
/**
* Grouping of all the key vault update stages.
*/
@LangDefinition(ContainerName = "~/AccessPolicy.Update", ContainerFileName = "IUpdate", IsContainerOnly = true)
interface UpdateStages {
/**
* The access policy update stage allowing permissions to be added or removed.
Expand Down Expand Up @@ -434,6 +441,7 @@ interface WithPermissions {
/**
* The entirety of an access policy update as part of a key vault update.
*/
@LangDefinition(ContainerName = "~/AccessPolicy.Update", ContainerFileName = "IUpdate")
interface Update extends
UpdateStages.WithPermissions,
Settable<Vault.Update> {
Expand Down
6 changes: 6 additions & 0 deletions azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/Vault.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

package com.microsoft.azure.management.keyvault;

import com.microsoft.azure.management.apigeneration.LangDefinition;
import com.microsoft.azure.management.keyvault.implementation.VaultInner;
import com.microsoft.azure.management.resources.fluentcore.arm.models.GroupableResource;
import com.microsoft.azure.management.resources.fluentcore.model.Appliable;
Expand All @@ -19,6 +20,7 @@
/**
* An immutable client-side representation of an Azure Key Vault.
*/
@LangDefinition
public interface Vault extends
GroupableResource,
Refreshable<Vault>,
Expand Down Expand Up @@ -72,6 +74,7 @@ public interface Vault extends
/**
* Container interface for all the definitions that need to be implemented.
*/
@LangDefinition(ContainerName = "~/Vault.Definition", ContainerFileName = "IDefinition")
interface Definition extends
DefinitionStages.Blank,
DefinitionStages.WithGroup,
Expand All @@ -82,6 +85,7 @@ interface Definition extends
/**
* Grouping of all the key vault definition stages.
*/
@LangDefinition(ContainerName = "~/Vault.Definition", ContainerFileName = "IDefinition", IsContainerOnly = true)
interface DefinitionStages {
/**
* The first stage of the key vault definition.
Expand Down Expand Up @@ -199,6 +203,7 @@ interface WithCreate extends
/**
* Grouping of all the key vault update stages.
*/
@LangDefinition(ContainerName = "~/Vault.Update", ContainerFileName = "IUpdate", IsContainerOnly = true)
interface UpdateStages {
/**
* A key vault update allowing access policies to be modified, attached, or removed.
Expand Down Expand Up @@ -287,6 +292,7 @@ interface WithConfigurations {
/**
* The template for a key vault update operation, containing all the settings that can be modified.
*/
@LangDefinition(ContainerName = "~/Vault.Update", ContainerFileName = "IUpdate")
interface Update extends
Appliable<Vault>,
UpdateStages.WithAccessPolicy,
Expand Down
2 changes: 2 additions & 0 deletions azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/Vaults.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

package com.microsoft.azure.management.keyvault;

import com.microsoft.azure.management.apigeneration.LangDefinition;
import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsDeletingByGroup;
import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingByGroup;
import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingById;
Expand All @@ -17,6 +18,7 @@
/**
* Entry point for key vaults management API.
*/
@LangDefinition(ContainerName = "~/")
public interface Vaults extends
SupportsListing<Vault>,
SupportsCreating<Vault.DefinitionStages.Blank>,
Expand Down
Loading