Skip to content
Merged
Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
44577b4
add module-info for azure-resourcemanager-resources
xseeseesee Sep 14, 2020
176829b
add module-info for azure-resourcemanager-storage
xseeseesee Sep 14, 2020
6138e6a
add module-info for azure-resourcemanager-appservice
xseeseesee Sep 14, 2020
2e3665e
add module-info for azure-resourcemanager-authorization
xseeseesee Sep 14, 2020
202440c
add module-info for azure-resourcemanager-compute
xseeseesee Sep 14, 2020
f6733b7
add module-info for azure-resourcemanager-msi
xseeseesee Sep 14, 2020
d9a54d4
add module-info for azure-resourcemanager-appplatform
xseeseesee Sep 14, 2020
78e952b
add module-info for azure-resourcemanager-containerinstance
xseeseesee Sep 14, 2020
66885b1
add module-info for azure-resourcemanager-cosmos
xseeseesee Sep 14, 2020
3097eca
add module-info for azure-resourcemanager-monitor
xseeseesee Sep 14, 2020
ad32839
add module-info for azure-resourcemanager-privatedns
xseeseesee Sep 14, 2020
4c4d764
add module-info for azure-resourcemanager-redis
xseeseesee Sep 14, 2020
bd7c192
add module-info for azure-resourcemanager-containerregistry
xseeseesee Sep 14, 2020
dc62ba5
add module-info for azure-resourcemanager-containerservice
xseeseesee Sep 14, 2020
9869b98
add module-info for azure-resourcemanager-dns
xseeseesee Sep 14, 2020
f913540
add module-info for azure-resourcemanager-eventhubs
xseeseesee Sep 14, 2020
d3e89d2
add module-info for azure-resourcemanager-keyvault
xseeseesee Sep 14, 2020
c67a2d7
add module-info for azure-resourcemanager-network
xseeseesee Sep 14, 2020
386a2c1
add module-info for azure-resourcemanager-servicebus
xseeseesee Sep 14, 2020
28c672d
add module-info for azure-resourcemanager-sql
xseeseesee Sep 14, 2020
3e5c652
add module-info for azure-resourcemanager-trafficmanager
xseeseesee Sep 14, 2020
8e046cb
add module-info for azure-resourcemanager
xseeseesee Sep 14, 2020
e7a1896
Merge branch 'master' into add-mgmt-module-info
xseeseesee Sep 14, 2020
5ad93c3
update module-info for exception added and transitive required
xseeseesee Sep 14, 2020
d5aec28
update keyvault module-info
xseeseesee Sep 14, 2020
cd4743b
Merge branch 'master' into add-mgmt-module-info
xseeseesee Sep 18, 2020
fc2d001
Merge branch 'master' into add-mgmt-module-info
xseeseesee Sep 21, 2020
0c397b7
add module for cdn
xseeseesee Sep 21, 2020
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

module com.azure.resourcemanager.appplatform {
requires transitive com.azure.resourcemanager.resources;
requires com.azure.storage.file.share;

// export public APIs of appplatform
exports com.azure.resourcemanager.appplatform;
exports com.azure.resourcemanager.appplatform.fluent;
exports com.azure.resourcemanager.appplatform.fluent.inner;
exports com.azure.resourcemanager.appplatform.models;

// open packages specifically for azure core and jackson
opens com.azure.resourcemanager.appplatform.fluent.inner to
com.azure.core,
com.fasterxml.jackson.databind;
opens com.azure.resourcemanager.appplatform.models to
com.azure.core,
com.fasterxml.jackson.databind;
}
4 changes: 4 additions & 0 deletions sdk/resourcemanager/azure-resourcemanager-appservice/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,10 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
<scope>test</scope>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
import com.azure.resourcemanager.appservice.fluent.inner.StringDictionaryInner;
import com.azure.resourcemanager.appservice.models.WebSiteBase;
import com.azure.resourcemanager.authorization.models.BuiltInRole;
import com.azure.resourcemanager.authorization.implementation.RoleAssignmentHelper;
import com.azure.resourcemanager.authorization.utils.RoleAssignmentHelper;
import com.azure.resourcemanager.msi.models.Identity;
import com.azure.resourcemanager.resources.fluentcore.arm.models.implementation.GroupableResourceImpl;
import com.azure.resourcemanager.resources.fluentcore.dag.FunctionalTaskItem;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import com.azure.resourcemanager.appservice.fluent.inner.SitePatchResourceInner;
import com.azure.resourcemanager.appservice.models.WebAppBase;
import com.azure.resourcemanager.authorization.AuthorizationManager;
import com.azure.resourcemanager.authorization.implementation.RoleAssignmentHelper;
import com.azure.resourcemanager.authorization.utils.RoleAssignmentHelper;
import com.azure.resourcemanager.msi.models.Identity;
import com.azure.resourcemanager.resources.fluentcore.dag.TaskGroup;
import com.azure.resourcemanager.resources.fluentcore.model.Creatable;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

module com.azure.resourcemanager.appservice {
requires transitive com.azure.resourcemanager.resources;
requires transitive com.azure.resourcemanager.dns;
requires transitive com.azure.resourcemanager.keyvault;
requires transitive com.azure.resourcemanager.msi;
requires transitive com.azure.resourcemanager.storage;

// export public APIs of appservice
exports com.azure.resourcemanager.appservice;
exports com.azure.resourcemanager.appservice.fluent;
exports com.azure.resourcemanager.appservice.fluent.inner;
exports com.azure.resourcemanager.appservice.models;

// open packages specifically for azure core and jackson
opens com.azure.resourcemanager.appservice.fluent.inner to
com.azure.core,
com.fasterxml.jackson.databind;
opens com.azure.resourcemanager.appservice.models to
com.azure.core,
com.fasterxml.jackson.databind;
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

package com.azure.resourcemanager.authorization.implementation;
package com.azure.resourcemanager.authorization.utils;

import com.azure.core.management.exception.ManagementException;
import com.azure.resourcemanager.authorization.AuthorizationManager;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

/**
* This package contains utility classes for working with Azure authorization.
*/
package com.azure.resourcemanager.authorization.utils;
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

module com.azure.resourcemanager.authorization {
requires transitive com.azure.resourcemanager.resources;

// export public APIs of authorization
exports com.azure.resourcemanager.authorization;
exports com.azure.resourcemanager.authorization.fluent;
exports com.azure.resourcemanager.authorization.fluent.inner;
exports com.azure.resourcemanager.authorization.models;
exports com.azure.resourcemanager.authorization.utils;

// open packages specifically for azure core and jackson
opens com.azure.resourcemanager.authorization.fluent.inner to
com.azure.core,
com.fasterxml.jackson.databind;
opens com.azure.resourcemanager.authorization.models to
com.azure.core,
com.fasterxml.jackson.databind;
}
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
import com.azure.resourcemanager.compute.fluent.inner.VirtualMachineUpdateInner;
import com.azure.resourcemanager.authorization.models.BuiltInRole;
import com.azure.resourcemanager.authorization.AuthorizationManager;
import com.azure.resourcemanager.authorization.implementation.RoleAssignmentHelper;
import com.azure.resourcemanager.authorization.utils.RoleAssignmentHelper;
import com.azure.resourcemanager.msi.models.Identity;
import com.azure.resourcemanager.network.models.Network;
import com.azure.resourcemanager.network.models.NetworkInterface;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import com.azure.resourcemanager.compute.fluent.inner.VirtualMachineInner;
import com.azure.resourcemanager.compute.fluent.inner.VirtualMachineUpdateInner;
import com.azure.resourcemanager.authorization.AuthorizationManager;
import com.azure.resourcemanager.authorization.implementation.RoleAssignmentHelper;
import com.azure.resourcemanager.authorization.utils.RoleAssignmentHelper;
import com.azure.resourcemanager.msi.models.Identity;
import com.azure.resourcemanager.resources.fluentcore.dag.TaskGroup;
import com.azure.resourcemanager.resources.fluentcore.model.Creatable;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
import com.azure.resourcemanager.compute.fluent.inner.VirtualMachineScaleSetInner;
import com.azure.resourcemanager.authorization.models.BuiltInRole;
import com.azure.resourcemanager.authorization.AuthorizationManager;
import com.azure.resourcemanager.authorization.implementation.RoleAssignmentHelper;
import com.azure.resourcemanager.authorization.utils.RoleAssignmentHelper;
import com.azure.resourcemanager.msi.models.Identity;
import com.azure.resourcemanager.network.models.ApplicationSecurityGroup;
import com.azure.resourcemanager.network.models.LoadBalancer;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import com.azure.resourcemanager.compute.models.VirtualMachineScaleSetUpdate;
import com.azure.resourcemanager.compute.fluent.inner.VirtualMachineScaleSetInner;
import com.azure.resourcemanager.authorization.AuthorizationManager;
import com.azure.resourcemanager.authorization.implementation.RoleAssignmentHelper;
import com.azure.resourcemanager.authorization.utils.RoleAssignmentHelper;
import com.azure.resourcemanager.msi.models.Identity;
import com.azure.resourcemanager.resources.fluentcore.dag.TaskGroup;
import com.azure.resourcemanager.resources.fluentcore.model.Creatable;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

module com.azure.resourcemanager.compute {
requires transitive com.azure.resourcemanager.resources;
requires transitive com.azure.resourcemanager.msi;
requires transitive com.azure.resourcemanager.network;
requires transitive com.azure.resourcemanager.storage;
Comment on lines +7 to +8
Copy link
Member

Choose a reason for hiding this comment

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

Do you need network and storage also to be transitive?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

In fluent interfaces, we provide convenient configs when creating virtual machine, like withExistingPrimaryNetwork(Network network), withExistingStorageAccount(StorageAccount storageAccount). The Network comes from module of com.azure.resourcemanager.network, and the StorageAccount is from com.azure.resourcemanager.storage.

Thus it requires transitive keyword. Otherwise, the end users have to add additional requires statement explicitly when calling withExistingPrimaryNetwork/withExistingStorageAccount.


// export public APIs of compute
exports com.azure.resourcemanager.compute;
exports com.azure.resourcemanager.compute.fluent;
exports com.azure.resourcemanager.compute.fluent.inner;
exports com.azure.resourcemanager.compute.models;

// open packages specifically for azure core and jackson
opens com.azure.resourcemanager.compute.fluent.inner to
com.azure.core,
com.fasterxml.jackson.databind;
opens com.azure.resourcemanager.compute.models to
com.azure.core,
com.fasterxml.jackson.databind;
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
package com.azure.resourcemanager.containerinstance.implementation;

import com.azure.core.management.Resource;
import com.azure.resourcemanager.authorization.implementation.RoleAssignmentHelper;
import com.azure.resourcemanager.authorization.utils.RoleAssignmentHelper;
import com.azure.resourcemanager.authorization.models.BuiltInRole;
import com.azure.resourcemanager.containerinstance.ContainerInstanceManager;
import com.azure.resourcemanager.containerinstance.fluent.inner.ContainerGroupInner;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
package com.azure.resourcemanager.containerinstance.implementation;

import com.azure.core.util.logging.ClientLogger;
import com.azure.resourcemanager.authorization.implementation.RoleAssignmentHelper;
import com.azure.resourcemanager.authorization.utils.RoleAssignmentHelper;
import com.azure.resourcemanager.containerinstance.fluent.inner.ContainerGroupInner;
import com.azure.resourcemanager.containerinstance.models.ContainerGroupIdentity;
import com.azure.resourcemanager.containerinstance.models.ContainerGroupIdentityUserAssignedIdentities;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

module com.azure.resourcemanager.containerinstance {
requires transitive com.azure.resourcemanager.resources;
requires transitive com.azure.resourcemanager.msi;
requires com.azure.resourcemanager.storage;
requires com.azure.resourcemanager.network;
requires com.azure.storage.file.share;

// export public APIs of containerinstance
exports com.azure.resourcemanager.containerinstance;
exports com.azure.resourcemanager.containerinstance.fluent;
exports com.azure.resourcemanager.containerinstance.fluent.inner;
exports com.azure.resourcemanager.containerinstance.models;

// open packages specifically for azure core and jackson
opens com.azure.resourcemanager.containerinstance.fluent.inner to
com.azure.core,
com.fasterxml.jackson.databind;
opens com.azure.resourcemanager.containerinstance.models to
com.azure.core,
com.fasterxml.jackson.databind;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

module com.azure.resourcemanager.containerregistry {
requires transitive com.azure.resourcemanager.resources;
requires transitive com.azure.resourcemanager.storage;

// export public APIs of containerregistry
exports com.azure.resourcemanager.containerregistry;
exports com.azure.resourcemanager.containerregistry.fluent;
exports com.azure.resourcemanager.containerregistry.fluent.inner;
exports com.azure.resourcemanager.containerregistry.models;

// open packages specifically for azure core and jackson
opens com.azure.resourcemanager.containerregistry.fluent.inner to
com.azure.core,
com.fasterxml.jackson.databind;
opens com.azure.resourcemanager.containerregistry.models to
com.azure.core,
com.fasterxml.jackson.databind;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

module com.azure.resourcemanager.containerservice {
requires transitive com.azure.resourcemanager.resources;

// export public APIs of containerservice
exports com.azure.resourcemanager.containerservice;
exports com.azure.resourcemanager.containerservice.fluent;
exports com.azure.resourcemanager.containerservice.fluent.inner;
exports com.azure.resourcemanager.containerservice.models;

// open packages specifically for azure core and jackson
opens com.azure.resourcemanager.containerservice.fluent.inner to
com.azure.core,
com.fasterxml.jackson.databind;
opens com.azure.resourcemanager.containerservice.models to
com.azure.core,
com.fasterxml.jackson.databind;
}
22 changes: 22 additions & 0 deletions sdk/resourcemanager/azure-resourcemanager-cosmos/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,28 @@
</dependency>
</dependencies>
</profile>
<profile>
<id>java-lts</id>
<activation>
<jdk>[11,)</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M3</version> <!-- {x-version-update;org.apache.maven.plugins:maven-surefire-plugin;external_dependency} -->
<configuration>
<argLine>
<!-- tests fail without these exports. -->
--add-exports com.azure.resourcemanager.resources/com.azure.resourcemanager.resources.fluentcore.arm.collection.implementation=ALL-UNNAMED
--add-exports com.azure.resourcemanager.resources/com.azure.resourcemanager.resources.fluentcore.arm.models.implementation=ALL-UNNAMED
</argLine>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<build>
<plugins>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

module com.azure.resourcemanager.cosmos {
requires transitive com.azure.resourcemanager.resources;

// export public APIs of cosmos
exports com.azure.resourcemanager.cosmos;
exports com.azure.resourcemanager.cosmos.fluent;
exports com.azure.resourcemanager.cosmos.fluent.inner;
exports com.azure.resourcemanager.cosmos.models;

// open packages specifically for azure core and jackson
opens com.azure.resourcemanager.cosmos.fluent.inner to
com.azure.core,
com.fasterxml.jackson.databind;
opens com.azure.resourcemanager.cosmos.models to
com.azure.core,
com.fasterxml.jackson.databind;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

module com.azure.resourcemanager.dns {
requires transitive com.azure.resourcemanager.resources;

// export public APIs of dns
exports com.azure.resourcemanager.dns;
exports com.azure.resourcemanager.dns.fluent;
exports com.azure.resourcemanager.dns.fluent.inner;
exports com.azure.resourcemanager.dns.models;

// open packages specifically for azure core and jackson
opens com.azure.resourcemanager.dns.fluent.inner to
com.azure.core,
com.fasterxml.jackson.databind;
opens com.azure.resourcemanager.dns.models to
com.azure.core,
com.fasterxml.jackson.databind;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

module com.azure.resourcemanager.eventhubs {
requires transitive com.azure.resourcemanager.resources;
requires com.azure.resourcemanager.storage;

// export public APIs of eventhubs
exports com.azure.resourcemanager.eventhubs;
exports com.azure.resourcemanager.eventhubs.fluent;
exports com.azure.resourcemanager.eventhubs.fluent.inner;
exports com.azure.resourcemanager.eventhubs.models;

// open packages specifically for azure core and jackson
opens com.azure.resourcemanager.eventhubs.fluent.inner to
com.azure.core,
com.fasterxml.jackson.databind;
opens com.azure.resourcemanager.eventhubs.models to
com.azure.core,
com.fasterxml.jackson.databind;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

module com.azure.resourcemanager.keyvault {
requires transitive com.azure.resourcemanager.resources;
requires transitive com.azure.security.keyvault.keys;
requires transitive com.azure.security.keyvault.secrets;
requires transitive com.azure.resourcemanager.authorization;

// export public APIs of keyvault
exports com.azure.resourcemanager.keyvault;
exports com.azure.resourcemanager.keyvault.fluent;
exports com.azure.resourcemanager.keyvault.fluent.inner;
exports com.azure.resourcemanager.keyvault.models;

// open packages specifically for azure core and jackson
opens com.azure.resourcemanager.keyvault.fluent.inner to
com.azure.core,
com.fasterxml.jackson.databind;
opens com.azure.resourcemanager.keyvault.models to
com.azure.core,
com.fasterxml.jackson.databind;
}
Loading