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

Feature/update-capabilities-automatically #86

Merged
merged 59 commits into from
Nov 14, 2017
Merged
Changes from 1 commit
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
3780ef7
Add UpdateLayerCapabilities ActionHandler for WMS and WMTS layers
jampukka Aug 1, 2017
45a78b4
Tiny refactoring
jampukka Aug 1, 2017
338220d
Delete as unused
jampukka Aug 1, 2017
47e9924
Add few logging statements
jampukka Aug 1, 2017
3257290
Merge branch 'develop' into feature/timeseries-capabilities
jampukka Aug 10, 2017
39d10f1
Temp commit
jampukka Aug 10, 2017
88093a3
Merge remote-tracking branch 'oskari/develop' into feature/timeseries…
jampukka Aug 14, 2017
a8be392
Delete InMemoryImpl
jampukka Aug 15, 2017
210f6bb
Change OskariLayerCapabilities to immutable, make necessary changes t…
jampukka Aug 16, 2017
8c7e2cf
Change type of OskariLayerCapabilities.created and updated from java.…
jampukka Aug 16, 2017
02a797d
Create a separate class OskariLayerCapabilitiesDraft for non-persiste…
jampukka Aug 16, 2017
5da1c3b
Rename CapabilitiesInsertInfo to OskariLayerCapabilitiesInsertInfo
jampukka Aug 16, 2017
a6eec6a
Update CapabilitiesCacheServiceMock to reflect changes in OskariLayer…
jampukka Aug 16, 2017
e884427
Fix issue with executing updates or inserts within @Select() annotati…
jampukka Aug 17, 2017
a5c2a01
Add ServiceExceptions to CapabilitiesCacheService
jampukka Aug 17, 2017
889b3cc
Remove OskariLayerCapabilitiesDraft, change OskariLayerCapabilities t…
jampukka Aug 21, 2017
4f450b6
Change OskariLayerCapabilities to mostly immutable
jampukka Aug 21, 2017
8fc0f6b
Fix Mock class
jampukka Aug 21, 2017
a3cc9be
Move logic that handles GetCapabilities information from SaveLayerHan…
jampukka Aug 23, 2017
b35b35e
Remove UpdateLayerCapabilitiesHandler not necessary with scheduled im…
jampukka Aug 23, 2017
a2a11c0
Remove unuseful test
jampukka Aug 23, 2017
5db326d
Add few utility methods
jampukka Aug 25, 2017
0ea589b
Add logic that checks that the response from service is a proper GetC…
jampukka Aug 25, 2017
860feba
Remove extra whitespace before linebreak
jampukka Aug 25, 2017
4389009
Tiny fixes
jampukka Sep 5, 2017
7f4c3e8
Fix imports
jampukka Sep 13, 2017
3da69c4
Fix imports part2
jampukka Sep 13, 2017
1ed5ad7
Use PARAM_SRS_NAME instead of "srs_name"
jampukka Sep 13, 2017
f8f8e31
validateCapabilities() now throws ServiceExceptions instead of return…
jampukka Sep 13, 2017
6439ff5
Remove as unused
jampukka Sep 13, 2017
457cb75
Merge oskari/develop
jampukka Sep 14, 2017
1f556de
Add newline to end of file, dont add new lines where not necessary
jampukka Sep 14, 2017
858ab19
Refactor WMTSCapabilitiesParser
jampukka Sep 14, 2017
2980b2d
Remove Collection.unmodifiableXXX() wrappers
jampukka Sep 15, 2017
8789012
Little clean ups
jampukka Sep 15, 2017
4067133
Log invalid TileMatrixLimits instead of throwing an exception, add as…
jampukka Sep 15, 2017
1dd9c04
Improve error handling
jampukka Sep 15, 2017
131cea5
Add support for setting the maxAge via property
jampukka Sep 15, 2017
c1dad75
Add a test, not really a unit testable class
jampukka Sep 15, 2017
c2c0546
Add this back, maybe its needed, who knows
jampukka Sep 15, 2017
b0a30ca
Fix the Property name
jampukka Sep 15, 2017
2e2a5b5
Prevent crashing while instantiating if DataSource is null
jampukka Sep 18, 2017
222f895
Throw NPE instead of ServiceRuntimeException, more fitting
jampukka Sep 18, 2017
915f6f1
Add backwards compatibility
jampukka Sep 18, 2017
e2e9054
Dont write version column, it doesnt exist yet
jampukka Sep 19, 2017
a783be4
Dont modify xslt parameter
jampukka Sep 19, 2017
a465886
Add service-capabilities-update to parents pom
jampukka Sep 19, 2017
b4a14cd
Add some logging to UpdateCapabilitiesJob
jampukka Sep 19, 2017
78886d6
Fix TileMatrixLimits
jampukka Sep 19, 2017
98c75c1
Dont both log and throw an exception with the same message. Dont retu…
jampukka Oct 2, 2017
a728738
Fix multiple issues, remove support for WMS layers for now
jampukka Oct 3, 2017
5b92460
Undo these unnecessary changes to make the branch more linear
jampukka Oct 3, 2017
dca36d0
Fix text to reflect the removal of wms services
jampukka Oct 3, 2017
1a68242
Move package, change OskariLayerCapabilities full constructor to public
jampukka Oct 3, 2017
90872be
Move package, change OskariLayerCapabilities full constructor to public
jampukka Oct 3, 2017
05ddaff
Merge remote-tracking branch 'oskari/develop' into feature/timeseries…
jampukka Oct 3, 2017
7a344fe
bump version
jampukka Oct 3, 2017
4b2bd87
Merge remote-tracking branch 'oskari/develop' into feature/timeseries…
jampukka Nov 13, 2017
db0cf78
Fix merge
jampukka Nov 13, 2017
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
Prev Previous commit
Next Next commit
Prevent crashing while instantiating if DataSource is null
  • Loading branch information
jampukka committed Sep 18, 2017
commit 2e2a5b589bd88ecb7dcbc397d2b6b26d6ade24fd
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,12 @@ public CapabilitiesCacheServiceMybatisImpl() {
}

public CapabilitiesCacheServiceMybatisImpl(DataSource ds) {
this.factory = MyBatisHelper.initMyBatis(ds, CapabilitiesMapper.class);
if (ds == null) {
LOG.warn("DataSource was null, all future calls will throw NPEs!");
factory = null;
} else {
factory = MyBatisHelper.initMyBatis(ds, CapabilitiesMapper.class);
}
}

private CapabilitiesMapper getMapper(SqlSession session) {
Expand Down