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

Jump to bottom

misc language annotation corrections #1115

Merged
merged 5 commits into from
Sep 27, 2016
Merged

misc language annotation corrections #1115

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
00df8ec
language annotation corrections
Sep 27, 2016
d4be242
annotation correction
Sep 27, 2016
7fabaab
checkstyle fixes
Sep 27, 2016
c82e7fd
minor comment fix
Sep 27, 2016
6f7528c
annotation fixes in networking-related interfaces
Sep 27, 2016
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
21 changes: 12 additions & 9 deletions ...rc/main/java/com/microsoft/azure/management/resources/fluentcore/arm/models/Resource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
/**
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for
* license information.
*/
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
Copy link
Contributor

Choose a reason for hiding this comment

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

I think the standard format is to have a space: http://www.oracle.com/technetwork/java/codeconventions-141999.html

* Licensed under the MIT License. See License.txt in the project root for
* license information.
*/
Copy link
Contributor

Choose a reason for hiding this comment

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

I actually meant something like this:

/**
 * Copyright (c) Microsoft Corporation. All rights reserved.
 * Licensed under the MIT License. See License.txt in the project root for
 * license information.
 */

(from https://github.com/Azure/azure-sdk-for-java/blob/master/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/Creatable.java#L1)

Don't worry about it. I can do this for you.


package com.microsoft.azure.management.resources.fluentcore.arm.models;

import com.microsoft.azure.management.apigeneration.Fluent;
import com.microsoft.azure.management.apigeneration.LangDefinition;
import com.microsoft.azure.management.resources.fluentcore.arm.Region;
import com.microsoft.azure.management.resources.fluentcore.model.Indexable;

import java.util.Map;

/**
* Base interfaces for fluent resources.
*/
@Fluent
* Base interfaces for fluent resources.
*/
@LangDefinition()
public interface Resource extends Indexable {
/**
* @return the resource ID string
Expand Down Expand Up @@ -52,6 +52,7 @@ public interface Resource extends Indexable {
*
* @param <T> the type of the next stage resource definition
*/
@LangDefinition(ContainerName = "Resource.Definition", ContainerFileName = "IDefinition")
interface DefinitionWithRegion<T> {
/**
* Specifies the region for the resource by name.
Expand All @@ -73,6 +74,7 @@ interface DefinitionWithRegion<T> {
*
* @param <T> the type of the next stage resource definition
*/
@LangDefinition(ContainerName = "Resource.Definition", ContainerFileName = "IDefinition")
interface DefinitionWithTags<T> {
/**
* Specifies tags for the resource as a {@link Map}.
Expand All @@ -95,6 +97,7 @@ interface DefinitionWithTags<T> {
*
* @param <T> the type of the next stage resource update
*/
@LangDefinition(ContainerName = "Resource.Update", ContainerFileName = "IUpdate")
interface UpdateWithTags<T> {
/**
* Specifies tags for the resource as a {@link Map}.
Expand Down
3 changes: 3 additions & 0 deletions ...com/microsoft/azure/management/resources/fluentcore/collection/SupportsBatchCreation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package com.microsoft.azure.management.resources.fluentcore.collection;


import com.microsoft.azure.management.apigeneration.LangDefinition;
import com.microsoft.azure.management.apigeneration.LangDefinition.MethodConversion;
import com.microsoft.azure.management.resources.fluentcore.arm.models.Resource;
import com.microsoft.azure.management.resources.fluentcore.model.Creatable;
import com.microsoft.azure.management.resources.fluentcore.model.CreatedResources;
Expand All @@ -16,6 +18,7 @@
* (Note: this interface is not intended to be implemented by user code)
* @param <ResourceT> the top level Azure resource type
*/
@LangDefinition(ContainerName = "CollectionActions", MethodConversionType = MethodConversion.OnlyMethod)
public interface SupportsBatchCreation<ResourceT extends Resource> {
/**
* Executes the create requests on a collection (batch) of resources.
Expand Down
4 changes: 2 additions & 2 deletions ...s/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/Attachable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public interface Attachable<ParentT> {
* The final stage of the child object definition, as which it can be attached to the parent.
* @param <ParentT> the parent definition
*/
@LangDefinition(ContainerName = "~/Core.ChildResource.Definition", ContainerFileName = "IDefinition")
@LangDefinition(ContainerName = "~/ChildResource.Definition", ContainerFileName = "IDefinition")
interface InDefinition<ParentT> {
/**
* Attaches the child definition to the parent resource definiton.
Expand All @@ -50,7 +50,7 @@ interface InDefinitionAlt<ParentT> {
* The final stage of the child object definition, as which it can be attached to the parent.
* @param <ParentT> the parent definition
*/
@LangDefinition(ContainerName = "~/Core.ChildResource.Update", ContainerFileName = "IUpdate")
@LangDefinition(ContainerName = "~/ChildResource.Update", ContainerFileName = "IUpdate")
interface InUpdate<ParentT> {
/**
* Attaches the child definition to the parent resource update.
Expand Down