Fixed the bug in the bundle, using a delegated search engine. Added c…

…opyrights in classes where it was missing

forage-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>forage</artifactId>
         <groupId>com.livetheoogway.forage</groupId>
-        <version>1.0.1</version>
+        <version>1.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

forage-dropwizard-bundle/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>forage</artifactId>
         <groupId>com.livetheoogway.forage</groupId>
-        <version>1.0.1</version>
+        <version>1.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

forage-dropwizard-bundle/src/main/java/com/livetheoogway/forage/dropwizard/bundle/DelegatedForageSearchEngine.java

@@ -0,0 +1,25 @@
+package com.livetheoogway.forage.dropwizard.bundle;
+
+import com.livetheoogway.forage.models.query.ForageQuery;
+import com.livetheoogway.forage.models.result.ForageQueryResult;
+import com.livetheoogway.forage.search.engine.ForageSearchEngine;
+import com.livetheoogway.forage.search.engine.exception.ForageSearchError;
+
+import java.util.concurrent.atomic.AtomicReference;
+
+public class DelegatedForageSearchEngine<D> implements ForageSearchEngine<D> {
+    private final AtomicReference<ForageSearchEngine<D>> reference;
+
+    public DelegatedForageSearchEngine(ForageSearchEngine<D> preStart) {
+        this.reference = new AtomicReference<>(preStart);
+    }
+
+    public void onStart(ForageSearchEngine<D> engine) {
+        reference.set(engine);
+    }
+
+    @Override
+    public ForageQueryResult<D> search(final ForageQuery query) throws ForageSearchError {
+        return reference.get().search(query);
+    }
+}

forage-dropwizard-bundle/src/main/java/com/livetheoogway/forage/dropwizard/bundle/ForageBundle.java

@@ -26,16 +26,15 @@
 import io.dropwizard.ConfiguredBundle;
 import io.dropwizard.lifecycle.Managed;
 import io.dropwizard.setup.Environment;
-import lombok.Getter;
 
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
 public abstract class ForageBundle<T extends Configuration, D> implements ConfiguredBundle<T> {
 
-    /* the reference to the search engine that you need to use */
-    @Getter
-    private ForageSearchEngine<D> searchEngine;
+    /* the reference to the search engine that will get swapped with the actual one on start up */
+    private final DelegatedForageSearchEngine<D> delegatedForageSearchEngine
+            = new DelegatedForageSearchEngine<>(new ForagePreStartEngine<>());
 
     /**
      * @param configuration application configuration
@@ -55,6 +54,10 @@ public abstract class ForageBundle<T extends Configuration, D> implements Config
      */
     public abstract ForageConfiguration forageConfiguration(final T configuration);
 
+    public ForageSearchEngine<D> searchEngine() {
+        return delegatedForageSearchEngine;
+    }
+
     @Override
     public void run(final T configuration, final Environment environment) {
         AtomicReference<PeriodicUpdateEngine<IndexableDocument>> updateEngineRef = new AtomicReference<>();
@@ -67,7 +70,7 @@ public void start() {
 
                 final ForageEngineIndexer<D> forageEngineIndexer = new ForageEngineIndexer<>(engineBuilder);
 
-                searchEngine = forageEngineIndexer;
+                delegatedForageSearchEngine.onStart(forageEngineIndexer);
 
                 final PeriodicUpdateEngine<IndexableDocument> updateEngine = new PeriodicUpdateEngine<>(
                         bootstrap(configuration),

forage-dropwizard-bundle/src/main/java/com/livetheoogway/forage/dropwizard/bundle/ForageConfiguration.java

@@ -14,10 +14,17 @@
 
 package com.livetheoogway.forage.dropwizard.bundle;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Value;
 
 @Value
 public class ForageConfiguration {
     /* signifies how often the bootstrap is called */
     int refreshIntervalInSeconds;
+
+    @JsonCreator
+    public ForageConfiguration(@JsonProperty("refreshIntervalInSeconds") final int refreshIntervalInSeconds) {
+        this.refreshIntervalInSeconds = refreshIntervalInSeconds;
+    }
 }

forage-dropwizard-bundle/src/main/java/com/livetheoogway/forage/dropwizard/bundle/ForagePreStartEngine.java

@@ -0,0 +1,15 @@
+package com.livetheoogway.forage.dropwizard.bundle;
+
+import com.livetheoogway.forage.models.query.ForageQuery;
+import com.livetheoogway.forage.models.result.ForageQueryResult;
+import com.livetheoogway.forage.search.engine.ForageSearchEngine;
+import com.livetheoogway.forage.search.engine.exception.ForageErrorCode;
+import com.livetheoogway.forage.search.engine.exception.ForageSearchError;
+
+public class ForagePreStartEngine<D> implements ForageSearchEngine<D> {
+    @Override
+    public ForageQueryResult<D> search(final ForageQuery query) throws ForageSearchError {
+        throw new ForageSearchError(ForageErrorCode.SEARCH_ENGINE_INITIALIZATION_ERROR,
+                                    "Forage bundle is not started yet");
+    }
+}

forage-dropwizard-bundle/src/test/java/com/livetheoogway/forage/dropwizard/bundle/ForageBundleTest.java

@@ -96,7 +96,7 @@ public ForageConfiguration forageConfiguration(final SampleConfig configuration)
 
         final ForageSearchError error = Assertions.assertThrows(
                 ForageSearchError.class,
-                () -> bundle.getSearchEngine().search(QueryBuilder.matchQuery("author", "rowling").build()));
+                () -> bundle.searchEngine().search(QueryBuilder.matchQuery("author", "rowling").build()));
         Assertions.assertEquals(ForageErrorCode.QUERY_ENGINE_NOT_INITIALIZED_YET, error.getForageErrorCode());
 
         store.put(new Book("id1", "Harry Potter and the Half-Blood Prince", "J.K. Rowling", 4.57f, "eng", 652));
@@ -106,7 +106,7 @@ public ForageConfiguration forageConfiguration(final SampleConfig configuration)
                 .pollInterval(Duration.of(100, ChronoUnit.MILLIS))
                 .until(() -> {
                     try {
-                        final ForageQueryResult<Book> query2 = bundle.getSearchEngine().search(
+                        final ForageQueryResult<Book> query2 = bundle.searchEngine().search(
                                 QueryBuilder.matchQuery("author", "rowling").build());
                         return query2.getTotal().getTotal() == 1;
                     } catch (ForageSearchError e) {
@@ -116,7 +116,7 @@ public ForageConfiguration forageConfiguration(final SampleConfig configuration)
                         return false;
                     }
                 });
-        final ForageQueryResult<Book> results = bundle.getSearchEngine().search(
+        final ForageQueryResult<Book> results = bundle.searchEngine().search(
                 QueryBuilder.matchQuery("author", "rowling").build());
         Assertions.assertEquals("id1", results.getMatchingResults().get(0).getId());
         Assertions.assertEquals("Harry Potter and the Half-Blood Prince", results.getMatchingResults()

forage-models/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>forage</artifactId>
         <groupId>com.livetheoogway.forage</groupId>
-        <version>1.0.1</version>
+        <version>1.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

forage-models/src/main/java/com/livetheoogway/forage/models/DataId.java

@@ -1,3 +1,17 @@
+/*
+ * Copyright 2022. Live the Oogway, Tushar Naik
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
 package com.livetheoogway.forage.models;
 
 public interface DataId {

forage-models/src/main/java/com/livetheoogway/forage/models/query/ForageQuery.java

@@ -1,3 +1,17 @@
+/*
+ * Copyright 2022. Live the Oogway, Tushar Naik
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
 package com.livetheoogway.forage.models.query;
 
 import com.fasterxml.jackson.annotation.JsonSubTypes;

forage-models/src/main/java/com/livetheoogway/forage/models/query/ForageQueryType.java

@@ -1,3 +1,17 @@
+/*
+ * Copyright 2022. Live the Oogway, Tushar Naik
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
 package com.livetheoogway.forage.models.query;
 
 public enum ForageQueryType {

forage-models/src/main/java/com/livetheoogway/forage/models/query/ForageQueryVisitor.java

@@ -1,3 +1,17 @@
+/*
+ * Copyright 2022. Live the Oogway, Tushar Naik
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
 package com.livetheoogway.forage.models.query;
 
 @SuppressWarnings("java:S112")

forage-models/src/main/java/com/livetheoogway/forage/models/query/ForageSearchQuery.java

@@ -1,3 +1,17 @@
+/*
+ * Copyright 2022. Live the Oogway, Tushar Naik
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
 package com.livetheoogway.forage.models.query;
 
 import com.livetheoogway.forage.models.query.search.Query;

forage-models/src/main/java/com/livetheoogway/forage/models/query/PageQuery.java

@@ -1,3 +1,17 @@
+/*
+ * Copyright 2022. Live the Oogway, Tushar Naik
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
 package com.livetheoogway.forage.models.query;
 
 import lombok.EqualsAndHashCode;

forage-models/src/main/java/com/livetheoogway/forage/models/query/search/BooleanQuery.java

@@ -1,3 +1,17 @@
+/*
+ * Copyright 2022. Live the Oogway, Tushar Naik
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
 package com.livetheoogway.forage.models.query.search;
 
 import com.fasterxml.jackson.annotation.JsonCreator;

forage-models/src/main/java/com/livetheoogway/forage/models/query/search/ClauseType.java

@@ -1,3 +1,17 @@
+/*
+ * Copyright 2022. Live the Oogway, Tushar Naik
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
 package com.livetheoogway.forage.models.query.search;
 
 public enum ClauseType {

forage-models/src/main/java/com/livetheoogway/forage/models/query/search/ClauseVisitor.java

@@ -1,3 +1,17 @@
+/*
+ * Copyright 2022. Live the Oogway, Tushar Naik
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
 package com.livetheoogway.forage.models.query.search;
 
 public interface ClauseVisitor<T> {

forage-models/src/main/java/com/livetheoogway/forage/models/query/search/FuzzyMatchQuery.java

@@ -1,3 +1,17 @@
+/*
+ * Copyright 2022. Live the Oogway, Tushar Naik
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
 package com.livetheoogway.forage.models.query.search;
 
 import com.fasterxml.jackson.annotation.JsonCreator;

forage-models/src/main/java/com/livetheoogway/forage/models/query/search/MatchQuery.java

@@ -1,3 +1,17 @@
+/*
+ * Copyright 2022. Live the Oogway, Tushar Naik
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
 package com.livetheoogway.forage.models.query.search;
 
 import com.fasterxml.jackson.annotation.JsonCreator;

forage-models/src/main/java/com/livetheoogway/forage/models/query/search/ParsableQuery.java

@@ -1,3 +1,17 @@
+/*
+ * Copyright 2022. Live the Oogway, Tushar Naik
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
 package com.livetheoogway.forage.models.query.search;
 
 import com.fasterxml.jackson.annotation.JsonCreator;

forage-models/src/main/java/com/livetheoogway/forage/models/query/search/Query.java

@@ -1,3 +1,17 @@
+/*
+ * Copyright 2022. Live the Oogway, Tushar Naik
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
 package com.livetheoogway.forage.models.query.search;
 
 import com.fasterxml.jackson.annotation.JsonSubTypes;