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.

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

Bump org.openapitools:openapi-generator-gradle-plugin from 7.4.0 to 7.5.0 #3268

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ ext.plugins = [
"org.jsonschema2pojo:jsonschema2pojo-gradle-plugin:1.2.1",
"org.liquibase:liquibase-gradle-plugin:2.2.1",
"org.kordamp.gradle:jandex-gradle-plugin:1.1.0",
"org.openapitools:openapi-generator-gradle-plugin:7.4.0",
"org.openapitools:openapi-generator-gradle-plugin:7.5.0",
"org.springframework.boot:spring-boot-gradle-plugin:${springVersion}",
"org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:4.4.1.3373",
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
package org.candlepin.subscriptions.util;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.when;

import java.util.Set;
Expand Down Expand Up @@ -57,7 +57,7 @@ void findProductTagsBySku_WhenSkuNotPresent() {
when(offeringRepository.findOfferingBySku("sku")).thenReturn(new Offering());
OfferingProductTags productTags2 =
offeringProductTagLookupService.findPersistedProductTagsBySku("sku");
assertNull(productTags2.getData());
assertTrue(productTags2.getData().isEmpty());
}

@Test
Expand All @@ -72,7 +72,7 @@ void findProductTagsBySku_WhenSkuNotPresent() {

OfferingProductTags productTags =
offeringProductTagLookupService.findPersistedProductTagsBySku("sku");
assertNull(productTags.getData());
assertTrue(productTags.getData().isEmpty());
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -309,20 +309,19 @@ void testInstalledProductsIsMappedToProductId() {
consumer.getInstalledProducts().add(product);

ConduitFacts conduitFacts = controller.getFactsFromConsumer(consumer);
assertEquals(Arrays.asList("72"), conduitFacts.getRhProd());
assertEquals(List.of("72"), conduitFacts.getRhProd());
}

@Test
void testUnknownMacIsIgnored() {
String uuid = UUID.randomUUID().toString();
String systemUuid = UUID.randomUUID().toString();
Consumer consumer = new Consumer();
consumer.setUuid(uuid);
consumer.getFacts().put("net.interface.virbr0.mac_address", "Unknown");

ConduitFacts conduitFacts = controller.getFactsFromConsumer(consumer);
assertEquals(uuid, conduitFacts.getSubscriptionManagerId());
assertThat(conduitFacts.getMacAddresses(), Matchers.nullValue());
assertThat(conduitFacts.getMacAddresses(), Matchers.emptyIterable());
}

@Test
Expand All @@ -334,7 +333,7 @@ void testNoneMacIsIgnored() {

ConduitFacts conduitFacts = controller.getFactsFromConsumer(consumer);
assertEquals(uuid, conduitFacts.getSubscriptionManagerId());
assertThat(conduitFacts.getMacAddresses(), Matchers.nullValue());
assertThat(conduitFacts.getMacAddresses(), Matchers.emptyIterable());
}

@Test
Expand Down Expand Up @@ -375,7 +374,7 @@ void testTruncatedIpV4AddressIsIgnoredForNics() {
}

@Test
void testFilterLoopbackIpV4Address() {
void testFilterLoopBackIpV4Address() {
String factPrefix = "net.interface.lo.";

String loIpFact = "192.168.0.1,redacted, removed";
Expand Down
Loading