Move DocRefInfo

Author: stroomdev66

stroom-query-api/src/main/java/stroom/query/api/v2/DocRefInfo.java renamed to stroom-docref/src/main/java/stroom/docref/DocRefInfo.java

@@ -1,6 +1,20 @@
-package stroom.query.api.v2;
-
-import stroom.docref.DocRef;
+/*
+ * Copyright 2019 Crown Copyright
+ *
+ * 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 stroom.docref;
 
 import java.util.Objects;
 

stroom-query-audit/src/main/java/stroom/query/audit/service/DocRefService.java

@@ -1,7 +1,7 @@
 package stroom.query.audit.service;
 
 import stroom.docref.DocRef;
-import stroom.query.api.v2.DocRefInfo;
+import stroom.docref.DocRefInfo;
 import stroom.query.audit.ExportDTO;
 import stroom.query.audit.model.DocRefEntity;
 import stroom.query.security.ServiceUser;

stroom-query-sample/build.gradle

@@ -16,7 +16,7 @@
 
 ext.moduleName = 'stroom.query.sample'
 
-//apply plugin: 'com.benjaminsproule.swagger'
+apply plugin: 'com.benjaminsproule.swagger'
 
 dependencies {
     //--------Project----------
@@ -29,38 +29,38 @@ dependencies {
     implementation libs.ws_rs_api
 }
 
-//// Generate swagger specs for the ExampleEndpoint
-//// This is to allow easier checking of the generated spec files when making changes to the model's swagger annotations
-//swagger {
-//    apiSource {
-//        springmvc = false //makes it search for jersey annotations
-//        outputFormats = [ 'json', 'yaml' ]
-//        locations = [ 'stroom.query.api.v2.sample.ExampleEndpoint' ]
-//        schemes = [ 'http', 'https' ]
-//        host = 'localhost:8080'
-//        basePath = '/v2'
-//        info {
-//            title = 'stroom-query'
-//            version = 'v2'
-//            description = 'An API for querying data sources including the ability to request multiple result definitions'
-//            contact {
-//                name = 'GCHQ'
-//                url = 'https://github.com/gchq/stroom-query'
-//            }
-//            license {
-//                url = 'http://www.apache.org/licenses/LICENSE-2.0.html'
-//                name = 'Apache 2.0'
-//            }
-//        }
-//        //outputPath = "${project.buildDir}/generated/document.html"
-//        swaggerDirectory = "${project.buildDir}"
-//    }
-//}
-//
-//tasks.generateSwaggerDocumentation {
-//    dependsOn classes
-//}
-//
-//tasks.build{
-//    dependsOn generateSwaggerDocumentation
-//}
+// Generate swagger specs for the ExampleEndpoint
+// This is to allow easier checking of the generated spec files when making changes to the model's swagger annotations
+swagger {
+    apiSource {
+        springmvc = false //makes it search for jersey annotations
+        outputFormats = [ 'json', 'yaml' ]
+        locations = [ 'stroom.query.api.v2.sample.ExampleEndpoint' ]
+        schemes = [ 'http', 'https' ]
+        host = 'localhost:8080'
+        basePath = '/v2'
+        info {
+            title = 'stroom-query'
+            version = 'v2'
+            description = 'An API for querying data sources including the ability to request multiple result definitions'
+            contact {
+                name = 'GCHQ'
+                url = 'https://github.com/gchq/stroom-query'
+            }
+            license {
+                url = 'http://www.apache.org/licenses/LICENSE-2.0.html'
+                name = 'Apache 2.0'
+            }
+        }
+        //outputPath = "${project.buildDir}/generated/document.html"
+        swaggerDirectory = "${project.buildDir}"
+    }
+}
+
+tasks.generateSwaggerDocumentation {
+    dependsOn classes
+}
+
+tasks.build{
+    dependsOn generateSwaggerDocumentation
+}

stroom-query-testing/src/main/java/stroom/query/testing/DocRefRemoteServiceIT.java

@@ -4,7 +4,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import stroom.query.api.v2.DocRefInfo;
+import stroom.docref.DocRefInfo;
 import stroom.query.audit.ExportDTO;
 import stroom.query.audit.client.DocRefServiceHttpClient;
 import stroom.query.audit.client.NotFoundException;

stroom-query-testing/src/main/java/stroom/query/testing/DocRefResourceIT.java

@@ -5,7 +5,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import stroom.query.api.v2.DocRefInfo;
+import stroom.docref.DocRefInfo;
 import stroom.query.audit.ExportDTO;
 import stroom.query.audit.client.DocRefResourceHttpClient;
 import stroom.query.audit.model.DocRefEntity;

stroom-query-testing/src/main/java/stroom/query/testing/DocRefResourceNoAuthIT.java

@@ -5,7 +5,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import stroom.query.api.v2.DocRefInfo;
+import stroom.docref.DocRefInfo;
 import stroom.query.audit.ExportDTO;
 import stroom.query.audit.client.DocRefResourceHttpClient;
 import stroom.query.audit.model.DocRefEntity;