Skip to content

Commit

Permalink
Merge pull request #112 from HubSpot/jh/upgrade-basepom
Browse files Browse the repository at this point in the history
Upgrade to latest basepom
  • Loading branch information
jhaber authored Dec 30, 2023
2 parents 3fda4b2 + 1811354 commit ccfb558
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 14 deletions.
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.hubspot</groupId>
<artifactId>basepom</artifactId>
<version>25.8</version>
<version>56.1</version>
</parent>

<groupId>com.hubspot.jackson</groupId>
Expand All @@ -15,12 +15,12 @@

<properties>
<basepom.check.skip-dependency-versions-check>true</basepom.check.skip-dependency-versions-check>
<basepom.check.skip-spotbugs>true</basepom.check.skip-spotbugs>

<dep.jackson.version>2.16.1</dep.jackson.version>
<dep.jackson-databind.version>2.16.1</dep.jackson-databind.version>
<dep.javax-validation.version>2.0.1.Final</dep.javax-validation.version>
<dep.protobuf-java.version>3.19.3</dep.protobuf-java.version>
<dep.plugin.duplicate-finder.version>1.4.0</dep.plugin.duplicate-finder.version>
<dep.scala.version>2.12.18</dep.scala.version>
</properties>

Expand Down Expand Up @@ -124,7 +124,7 @@
<extension>
<groupId>kr.motd.maven</groupId>
<artifactId>os-maven-plugin</artifactId>
<version>1.6.2</version>
<version>1.7.1</version>
</extension>
</extensions>
</build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,14 @@
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Function;

public class ExtensionRegistryWrapper {

private final Function<Descriptor, Set<ExtensionInfo>> extensionFunction;

private ExtensionRegistryWrapper() {
this.extensionFunction =
new Function<Descriptor, Set<ExtensionInfo>>() {
@Override
public Set<ExtensionInfo> apply(Descriptor descriptor) {
return Collections.emptySet();
}
};
this.extensionFunction = ignored -> Collections.emptySet();
}

private ExtensionRegistryWrapper(final ExtensionRegistry extensionRegistry) {
Expand Down Expand Up @@ -64,8 +59,4 @@ public List<ExtensionInfo> findExtensionsByDescriptor(Descriptor descriptor) {
public Set<ExtensionInfo> getExtensionsByDescriptor(Descriptor descriptor) {
return extensionFunction.apply(descriptor);
}

private interface Function<T, V> {
V apply(T t);
}
}

0 comments on commit ccfb558

Please sign in to comment.