Upstream
/
Plan
mirror of https://github.com/plan-player-analytics/Plan.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Improve Extension error handling

This commit is contained in:
Aurora Lahtela 2023-04-18 19:14:12 +03:00
parent 5f0ecb8bbe
commit de884cd681
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/providers/gathering/DataValueGatherer.java
View File

@ -157,7 +157,7 @@ public class DataValueGatherer {
addValuesToBuilder2(dataBuilder, methods, parameters);
}
// TODO refactor to reduce cyclomatic complexity of the calling method
// TODO refactor to reduce cyclomatic complexity of the calling method
private void addValuesToBuilder2(ExtensionDataBuilder dataBuilder, ExtensionMethods methods, Parameters parameters) {
for (ExtensionMethod provider : methods.getDataBuilderProviders()) {
if (brokenMethods.contains(provider)) continue;
@ -408,7 +408,10 @@ public class DataValueGatherer {
.ifPresent(data -> storeTable(parameters, conditions, data));
} catch (DataExtensionMethodCallException methodError) {
logFailure(methodError);
} catch (Exception | NoClassDefFoundError | NoSuchFieldError | NoSuchMethodError unexpectedError) {
} catch (RejectedExecutionException ignore) {
// Processing or Database has shut down, which can be ignored
} catch (Exception | ExceptionInInitializerError | NoClassDefFoundError | NoSuchFieldError |
NoSuchMethodError unexpectedError) {
logFailure(unexpectedError);
}
}
@ -584,7 +587,7 @@ public class DataValueGatherer {
private void storePlayerComponent(Parameters parameters, Conditions conditions, ComponentDataValue data) {
ProviderInformation information = data.getInformation();
String value = getComponentAsJson(getValue(conditions, data, information)) ;
String value = getComponentAsJson(getValue(conditions, data, information));
if (value == null) return;
Database db = dbSystem.getDatabase();

4
Plan/extensions/src/main/java/com/djrapitops/plan/extension/implementation/ExtensionRegister.java
View File

@ -198,7 +198,7 @@ public class ExtensionRegister {
createExtension.apply(factory).ifPresent(this::register);
} catch (NotReadyException | UnsupportedOperationException ignore) {
// This exception signals that the extension can not be registered right now (Intended fail).
} catch (Exception | NoClassDefFoundError | IncompatibleClassChangeError e) {
} catch (Exception | ExceptionInInitializerError | NoClassDefFoundError | IncompatibleClassChangeError e) {
// Places all exceptions to one exception with plugin information so that they can be reported.
suppressException(factory.getClass(), e);
}
@ -213,7 +213,7 @@ public class ExtensionRegister {
createExtension.apply(factory).forEach(this::register);
} catch (NotReadyException | UnsupportedOperationException ignore) {
// This exception signals that the extension can not be registered right now (Intended fail).
} catch (Exception | NoClassDefFoundError | IncompatibleClassChangeError e) {
} catch (Exception | ExceptionInInitializerError | NoClassDefFoundError | IncompatibleClassChangeError e) {
// Places all exceptions to one exception with plugin information so that they can be reported.
suppressException(factory.getClass(), e);
}