1212 * limitations under the License.
1313 */
1414
15- package de .ubleipzig .iiif . dynamic .camel ;
15+ package de .ubleipzig .dynamo .camel ;
1616
17- import static de .ubleipzig .iiif .dynamic .JsonLdProcessorUtils .toJsonLd ;
18- import static de .ubleipzig .iiif .dynamic .QueryUtils .getQuery ;
1917import static de .ubleipzig .webanno .AbstractSerializer .serialize ;
2018import static java .net .URLEncoder .encode ;
2119import static org .apache .camel .Exchange .CONTENT_TYPE ;
2220import static org .apache .camel .Exchange .HTTP_CHARACTER_ENCODING ;
2321import static org .apache .camel .Exchange .HTTP_METHOD ;
22+ import static org .apache .camel .Exchange .HTTP_QUERY ;
2423import static org .apache .camel .Exchange .HTTP_RESPONSE_CODE ;
2524import static org .apache .camel .LoggingLevel .INFO ;
2625
2726import com .github .jsonldjava .core .JsonLdError ;
2827
28+ import de .ubleipzig .dynamo .JsonLdProcessorUtils ;
29+ import de .ubleipzig .dynamo .QueryUtils ;
2930import de .ubleipzig .webanno .CollectionBuilder ;
3031import de .ubleipzig .webanno .ManifestBuilder ;
3132import de .ubleipzig .webanno .templates .AnnotationList ;
3233
3334import java .io .IOException ;
35+ import java .io .InputStream ;
3436import java .io .UncheckedIOException ;
37+ import java .util .Hashtable ;
38+ import java .util .Objects ;
39+ import java .util .Properties ;
40+
41+ import javax .naming .Context ;
42+ import javax .naming .InitialContext ;
3543
3644import org .apache .camel .Exchange ;
3745import org .apache .camel .builder .RouteBuilder ;
38- import org .apache .camel .component . properties . PropertiesComponent ;
46+ import org .apache .camel .impl . JndiRegistry ;
3947import org .apache .camel .main .Main ;
4048import org .apache .camel .main .MainListenerSupport ;
4149import org .apache .camel .main .MainSupport ;
50+ import org .apache .camel .util .IOHelper ;
4251import org .slf4j .Logger ;
4352import org .slf4j .LoggerFactory ;
53+ import org .springframework .data .redis .connection .jedis .JedisConnectionFactory ;
54+ import org .springframework .data .redis .core .RedisTemplate ;
55+ import org .springframework .data .redis .serializer .StringRedisSerializer ;
4456
4557
4658/**
5062 */
5163public class Dynamo {
5264
65+ private static final Logger LOGGER = LoggerFactory .getLogger (Dynamo .class );
66+ private static final JedisConnectionFactory CONNECTION_FACTORY = new JedisConnectionFactory ();
67+ private static RedisTemplate <String , String > redisTemplate ;
68+
69+ static {
70+ CONNECTION_FACTORY .setHostName ("redis" );
71+ CONNECTION_FACTORY .setPort (6379 );
72+ CONNECTION_FACTORY .afterPropertiesSet ();
73+ }
74+
5375 /**
5476 * @param args String[]
5577 * @throws Exception Exception
@@ -66,6 +88,13 @@ private void init() throws Exception {
6688 final Main main = new Main ();
6789 main .addRouteBuilder (new QueryRoute ());
6890 main .addMainListener (new Events ());
91+ final JndiRegistry registry = new JndiRegistry (createInitialContext ());
92+ redisTemplate = new RedisTemplate <>();
93+ redisTemplate .setConnectionFactory (CONNECTION_FACTORY );
94+ redisTemplate .setDefaultSerializer (new StringRedisSerializer ());
95+ redisTemplate .afterPropertiesSet ();
96+ Objects .requireNonNull (registry ).bind ("redisTemplate" , redisTemplate );
97+ main .setPropertyPlaceholderLocations ("file:${env:DYNAMO_HOME}/de.ubleipzig.dynamo.cfg" );
6998 main .run ();
7099 }
71100
@@ -90,8 +119,6 @@ public void beforeStop(final MainSupport main) {
90119 */
91120 public static class QueryRoute extends RouteBuilder {
92121
93- private static final Logger LOGGER = LoggerFactory .getLogger (Dynamo .class );
94-
95122 private static final String contentTypeNTriples = "application/n-triples" ;
96123 private static final String contentTypeJsonLd = "application/ld+json" ;
97124 private static final String contentTypeHTMLForm = "application/x-www-form-urlencoded" ;
@@ -106,10 +133,7 @@ public static class QueryRoute extends RouteBuilder {
106133 */
107134 public void configure () {
108135
109- final PropertiesComponent pc = getContext ().getComponent ("properties" , PropertiesComponent .class );
110- pc .setLocation ("classpath:application.properties" );
111-
112- from ("jetty:http://{{rest.host}}:{{rest.port}}{{rest.prefix}}?"
136+ from ("jetty:http://{{dynamo.host}}:{{dynamo.port}}{{dynamo.prefix}}?"
113137 + "optionsEnabled=true&matchOnUriPrefix=true&sendServerVersion=false"
114138 + "&httpMethodRestrict=GET,OPTIONS" )
115139 .routeId ("Sparqler" )
@@ -118,9 +142,24 @@ public void configure() {
118142 .constant ("*" )
119143 .choice ()
120144 .when (header (HTTP_METHOD ).isEqualTo ("GET" ))
145+ .to ("direct:redis-get" );
146+ from ("direct:redis-get" )
147+ .routeId ("RedisGet" )
148+ .process (e -> {
149+ final String httpquery = e .getIn ().getHeader (HTTP_QUERY ).toString ();
150+ if (redisTemplate .opsForValue ().get (httpquery ) != null ) {
151+ e .getIn ().setBody (redisTemplate .opsForValue ().get (httpquery ));
152+ LOGGER .info ("Getting query result from Redis Cache" );
153+ } else {
154+ e .getIn ().setHeader (CONTENT_TYPE , EMPTY );
155+ }
156+ })
157+ .choice ()
158+ .when (header (CONTENT_TYPE ).isEqualTo (EMPTY ))
121159 .to ("direct:sparql" );
122160 from ("direct:sparql" )
123161 .routeId ("SparqlerGet" )
162+ .removeHeader (CONTENT_TYPE )
124163 .choice ()
125164 .when (header (SPARQL_QUERY ).isEqualTo ("meta" ))
126165 .to ("direct:getMetaGraph" )
@@ -135,7 +174,7 @@ public void configure() {
135174 .constant (contentTypeNTriples )
136175 .process (e -> e .getIn ()
137176 .setBody (sparqlConstruct (
138- getQuery ("canvas-anno.sparql" , getV1 (e ), getV2 (e )))))
177+ QueryUtils . getQuery ("canvas-anno.sparql" , getV1 (e ), getV2 (e )))))
139178 .to ("http4:{{triplestore.baseUrl}}?useSystemProperties=true&bridgeEndpoint=true" )
140179 .filter (header (HTTP_RESPONSE_CODE ).isEqualTo (200 ))
141180 .setHeader (CONTENT_TYPE )
@@ -151,7 +190,7 @@ public void configure() {
151190 .setHeader (HTTP_ACCEPT )
152191 .constant (contentTypeNTriples )
153192 .process (e -> e .getIn ()
154- .setBody (sparqlConstruct (getQuery ("collection.sparql" ))))
193+ .setBody (sparqlConstruct (QueryUtils . getQuery ("collection.sparql" ))))
155194 .to ("http4:{{triplestore.baseUrl}}?useSystemProperties=true&bridgeEndpoint=true" )
156195 .filter (header (HTTP_RESPONSE_CODE ).isEqualTo (200 ))
157196 .setHeader (CONTENT_TYPE )
@@ -206,7 +245,8 @@ public void configure() {
206245 .getBody ()
207246 .toString ());
208247 e .getIn ().setBody (builder .build ());
209- });
248+ })
249+ .to ("direct:redis-put" );
210250 from ("direct:buildCollection" )
211251 .routeId ("CollectionBuilder" )
212252 .removeHeader (HTTP_ACCEPT )
@@ -220,6 +260,18 @@ public void configure() {
220260 .getBody ()
221261 .toString ());
222262 e .getIn ().setBody (builder .build ());
263+ })
264+ .to ("direct:redis-put" );
265+ from ("direct:redis-put" )
266+ .routeId ("RedisPut" )
267+ .log (INFO , LOGGER , "Storing query result in Redis Cache" )
268+ .process (e -> {
269+ final String httpquery = e .getIn ().getHeader (HTTP_QUERY ).toString ();
270+ final String body = e .getIn ().getBody ().toString ();
271+ if (null == redisTemplate .opsForValue ().get (httpquery )) {
272+ redisTemplate .opsForValue ().set (httpquery , body );
273+ }
274+ e .getIn ().setBody (redisTemplate .opsForValue ().get (httpquery ));
223275 });
224276 }
225277
@@ -260,12 +312,31 @@ private void processJsonLdExchange(final Exchange e, final String contextUri, fi
260312 final String body = e .getIn ().getBody ().toString ();
261313 if ( body != null && !body .isEmpty ()) {
262314 e .getIn ()
263- .setBody (toJsonLd (e .getIn ()
264- .getBody ()
265- .toString (), contextUri , frameUri ));
315+ .setBody (JsonLdProcessorUtils . toJsonLd (e .getIn ()
316+ .getBody ()
317+ .toString (), contextUri , frameUri ));
266318 } else {
267319 e .getIn ().setHeader (CONTENT_TYPE , EMPTY );
268320 }
269321 }
270322 }
323+
324+
325+ /**
326+ *
327+ * @return InitialContext Context
328+ * @throws Exception Exception
329+ */
330+ private static Context createInitialContext () throws Exception {
331+ final InputStream in = Dynamo .class
332+ .getClassLoader ()
333+ .getResourceAsStream ("jndi.properties" );
334+ try {
335+ final Properties properties = new Properties ();
336+ properties .load (in );
337+ return new InitialContext (new Hashtable <>(properties ));
338+ } finally {
339+ IOHelper .close (in );
340+ }
341+ }
271342}
0 commit comments