This is an automated email from the ASF dual-hosted git repository.
bdelacretaz pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-graphql-schema-aggregator.git
The following commit(s) were added to refs/heads/master by this push:
new a48861b It's a Partial, not a PartialProvider
a48861b is described below
commit a48861b244f1807701d5db96ce7c2f69dc163967
Author: Bertrand Delacretaz <[email protected]>
AuthorDate: Fri Jul 16 11:17:07 2021 +0200
It's a Partial, not a PartialProvider
---
...yPartialProvider.java => BundleEntryPartial.java} | 20 +++++++++-----------
.../aggregator/impl/ProviderBundleTracker.java | 6 +++---
...ProviderTest.java => BundleEntryPartialTest.java} | 4 ++--
3 files changed, 14 insertions(+), 16 deletions(-)
diff --git
a/src/main/java/org/apache/sling/graphql/schema/aggregator/impl/BundleEntryPartialProvider.java
b/src/main/java/org/apache/sling/graphql/schema/aggregator/impl/BundleEntryPartial.java
similarity index 79%
rename from
src/main/java/org/apache/sling/graphql/schema/aggregator/impl/BundleEntryPartialProvider.java
rename to
src/main/java/org/apache/sling/graphql/schema/aggregator/impl/BundleEntryPartial.java
index cb522bd..8eb1ad2 100644
---
a/src/main/java/org/apache/sling/graphql/schema/aggregator/impl/BundleEntryPartialProvider.java
+++
b/src/main/java/org/apache/sling/graphql/schema/aggregator/impl/BundleEntryPartial.java
@@ -26,15 +26,13 @@ import org.osgi.framework.Bundle;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-/** {@PartialSchemaProvider} build out of a Bundle entry, which must be a valid
- * partial schema file.
- */
-class BundleEntryPartialProvider extends PartialReader implements
Comparable<BundleEntryPartialProvider> {
- private static final Logger log =
LoggerFactory.getLogger(BundleEntryPartialProvider.class.getName());
+/** A {@link Partial} built out of a Bundle entry using a {@link
PartialReader} */
+class BundleEntryPartial extends PartialReader implements
Comparable<BundleEntryPartial> {
+ private static final Logger log =
LoggerFactory.getLogger(BundleEntryPartial.class.getName());
private final String key;
private final long bundleId;
- private BundleEntryPartialProvider(Bundle b, URL bundleEntry) throws
IOException {
+ private BundleEntryPartial(Bundle b, URL bundleEntry) throws IOException {
super(getPartialName(bundleEntry), new URLReaderSupplier(bundleEntry));
this.bundleId = b.getBundleId();
this.key = String.format("%s(%d):%s", b.getSymbolicName(),
b.getBundleId(), bundleEntry.toString());
@@ -51,20 +49,20 @@ class BundleEntryPartialProvider extends PartialReader
implements Comparable<Bun
/** @return a BundleEntryPartialProvider for the entryPath in
* the supplied Bundle, or null if none can be built.
*/
- static BundleEntryPartialProvider forBundle(Bundle b, String entryPath)
throws IOException {
+ static BundleEntryPartial forBundle(Bundle b, String entryPath) throws
IOException {
final URL entry = b.getEntry(entryPath);
if(entry == null) {
log.info("Entry {} not found for bundle {}", entryPath,
b.getSymbolicName());
return null;
} else {
- return new BundleEntryPartialProvider(b, entry);
+ return new BundleEntryPartial(b, entry);
}
}
@Override
public boolean equals(Object other) {
- if(other instanceof BundleEntryPartialProvider) {
- return ((BundleEntryPartialProvider)other).key.equals(key);
+ if(other instanceof BundleEntryPartial) {
+ return ((BundleEntryPartial)other).key.equals(key);
}
return false;
}
@@ -83,7 +81,7 @@ class BundleEntryPartialProvider extends PartialReader
implements Comparable<Bun
}
@Override
- public int compareTo(BundleEntryPartialProvider o) {
+ public int compareTo(BundleEntryPartial o) {
return getName().compareTo(o.getName());
}
}
\ No newline at end of file
diff --git
a/src/main/java/org/apache/sling/graphql/schema/aggregator/impl/ProviderBundleTracker.java
b/src/main/java/org/apache/sling/graphql/schema/aggregator/impl/ProviderBundleTracker.java
index 7d38f9b..09c7b31 100644
---
a/src/main/java/org/apache/sling/graphql/schema/aggregator/impl/ProviderBundleTracker.java
+++
b/src/main/java/org/apache/sling/graphql/schema/aggregator/impl/ProviderBundleTracker.java
@@ -55,7 +55,7 @@ public class ProviderBundleTracker implements
BundleTrackerCustomizer<Object> {
public static final String SCHEMA_PATH_HEADER = "Sling-GraphQL-Schema";
private final Logger log = LoggerFactory.getLogger(getClass().getName());
- private final Map<String, BundleEntryPartialProvider> schemaProviders =
new ConcurrentHashMap<>();
+ private final Map<String, BundleEntryPartial> schemaProviders = new
ConcurrentHashMap<>();
private BundleContext bundleContext;
@@ -82,7 +82,7 @@ public class ProviderBundleTracker implements
BundleTrackerCustomizer<Object> {
while (paths.hasMoreElements()) {
final String path = paths.nextElement();
try {
-
addIfNotPresent(BundleEntryPartialProvider.forBundle(bundle, path));
+
addIfNotPresent(BundleEntryPartial.forBundle(bundle, path));
} catch (IOException ioe) {
// TODO save errors and refuse to work if any
happended?
log.error("Error reading partial " + path, ioe);
@@ -94,7 +94,7 @@ public class ProviderBundleTracker implements
BundleTrackerCustomizer<Object> {
return bundle;
}
- private void addIfNotPresent(BundleEntryPartialProvider a) {
+ private void addIfNotPresent(BundleEntryPartial a) {
if(a != null) {
if(schemaProviders.containsKey(a.getName())) {
log.warn("Partial provider with name {} already present, new
one will be ignored", a.getName());
diff --git
a/src/test/java/org/apache/sling/graphql/schema/aggregator/impl/BundleEntryPartialProviderTest.java
b/src/test/java/org/apache/sling/graphql/schema/aggregator/impl/BundleEntryPartialTest.java
similarity index 89%
rename from
src/test/java/org/apache/sling/graphql/schema/aggregator/impl/BundleEntryPartialProviderTest.java
rename to
src/test/java/org/apache/sling/graphql/schema/aggregator/impl/BundleEntryPartialTest.java
index 428ac1b..046281c 100644
---
a/src/test/java/org/apache/sling/graphql/schema/aggregator/impl/BundleEntryPartialProviderTest.java
+++
b/src/test/java/org/apache/sling/graphql/schema/aggregator/impl/BundleEntryPartialTest.java
@@ -25,10 +25,10 @@ import java.net.URL;
import org.junit.Test;
-public class BundleEntryPartialProviderTest {
+public class BundleEntryPartialTest {
@Test
public void partialName() throws MalformedURLException {
final URL url = new URL("http://stuff/some/path/the.name.txt";);
- assertEquals("the.name",
BundleEntryPartialProvider.getPartialName(url));
+ assertEquals("the.name", BundleEntryPartial.getPartialName(url));
}
}
\ No newline at end of file
