Added REST services that leverage the CLI by emacthecav · Pull Request #1207 · locationtech/geowave

emacthecav · 2017-10-26T17:34:26Z

No description provided.

… swagger

…s/indexes. Various other small REST fixes/implementations

…inable

…mprove RESTful practices

…ebook

…nor bug fixes

rfecher · 2017-10-26T18:40:41Z

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2013-2017 Contributors to the Eclipse Foundation
+6 * Copyright (c) 2013-2017 Contributors to the Eclipse Foundation


still there

rfecher · 2017-10-26T18:42:57Z

+		// given
+		// parameters as the Default parameters. It's also done so that we can
+		// parse prefix annotations and special delegate processing.
+		JCommanderPrefixTranslator translator = new JCommanderPrefixTranslator();


do we know why the logic here got re-arranged?

I don't even think this is relevant to REST services, probably should convert back

rfecher · 2017-10-26T18:43:33Z

 /*******************************************************************************
 * Copyright (c) 2013-2017 Contributors to the Eclipse Foundation
- * 
+ *


this happens often, removing a space on this one line

rfecher · 2017-10-26T18:47:14Z

 					"=");
 			key = parts[0];
-			value = converter.convert(parts[1]);
+			value = parts[1];


we got rid of password converter, seems like a discrepancy with the old code

when execute() call this set a flag to indicate we still want to use the password converter, except only use the password converter if isPassword

rfecher · 2017-10-26T18:49:17Z

+			return setKeyValue(params);
+		}
+		catch (WritePropertiesException | ParameterException e) {
+			// TODO GEOWAVE-rest-project server error status message


can't we throw an exception or does returning null set error status?

can we log these?

rfecher · 2017-10-26T18:51:06Z

+	private Object setKeyValue(
+			final OperationParams params ) {
+
+		final File f = (File) params.getContext().get(


is there a reason we don't use getGeoConfigProperties() like the non-service code?

rfecher · 2017-10-26T18:54:23Z

+		final String indexList = parameters.get(1);
+
+		// Config file
+		final File configFile = (File) params.getContext().get(


again it looks like a slight change from previous in not using getGeoWaveConfig() ... my suspicion is that this is simply a mistake in one of the merges from master not reflecting that change rather than something that was consciously done

rfecher · 2017-10-26T18:55:14Z

+		final String indexList = parameters.get(2);
+
+		// Config file
+		final File configFile = (File) params.getContext().get(


getGeoWaveConfig() ?

rfecher · 2017-10-26T18:56:36Z


 		// Config file
-		File configFile = getGeoWaveConfigFile(params);
+		final File configFile = (File) params.getContext().get(


rfecher · 2017-10-26T18:57:22Z

+		final String indexList = parameters.get(3);
+
+		// Config file
+		final File configFile = (File) params.getContext().get(


rfecher · 2017-10-26T18:58:06Z

+			// Try to load the 'default' options.

-			String defaultIndex = existingProps.getProperty(IndexPluginOptions.DEFAULT_PROPERTY_NAMESPACE);
+			final File configFile = (File) params.getContext().get(


rfecher · 2017-10-26T18:58:31Z

+					"No type could be infered");
+		}
+
+		final File propFile = (File) params.getContext().get(


rfecher · 2017-10-26T18:58:58Z

+			addIndexGroup(params);
+		}
+		catch (WritePropertiesException | ParameterException e) {
+			// TODO GEOWAVE-rest-project server error status message


can't we supply server error status through some means

rfecher · 2017-10-26T18:59:17Z

+	 */
+	private void addIndexGroup(
+			final OperationParams params ) {
+		final File propFile = (File) params.getContext().get(


rfecher · 2017-10-26T19:47:42Z


 	@Parameter(description = "<workspace name>")
-	private List<String> parameters = new ArrayList<String>();
+	private final List<String> parameters = new ArrayList<String>();


rfecher · 2017-10-26T19:49:32Z

 							getConfig().getUser(),
 							getConfig().getPass()));
-					webTarget = client.target(url);
+					try {


this getWebTarget() is an issue (we should technically cache the client based on URL, user, and password, or invalidate it when one of those things changes)

rfecher · 2017-10-26T20:13:48Z

 docker-root
 generated
 .metadata
+swagger.json


let's just take them out

rfecher · 2017-10-26T20:15:53Z

@@ -0,0 +1 @@
+swagger.json


let's move this up a level to services because I believe it actually show up in webapp (and add api.db)

rfecher · 2017-10-30T15:10:44Z

+				value = parameters.get(1);
+			}
+			else {
+				value = converter.convert(parameters.get(1));


if (isPassword)

rfecher · 2017-10-30T15:10:47Z

+				value = parts[1];
+			}
+			else {
+				value = converter.convert(parts[1]);


if (isPassword)

rfecher · 2017-10-30T17:31:23Z

 			OperationParams params ) {
 		File configFile = (File) params.getContext().get(
 				ConfigOptions.PROPERTIES_FILE_CONTEXT);
+		;


strange addition

rfecher · 2017-10-30T17:31:34Z

 			// Config file
 			final File configFile = (File) params.getContext().get(
 					ConfigOptions.PROPERTIES_FILE_CONTEXT);
+			;


rfecher · 2017-10-30T17:31:43Z

 			OperationParams params ) {
 		File configFile = (File) params.getContext().get(
 				ConfigOptions.PROPERTIES_FILE_CONTEXT);
+		;


rfecher · 2017-10-30T17:32:42Z


 import mil.nga.giat.geowave.core.cli.annotations.GeowaveOperation;
 import mil.nga.giat.geowave.core.cli.api.DefaultOperation;
+import mil.nga.giat.geowave.core.cli.api.OperationParams;


strange addition

…document process, and consolidating into one location for each. Correcting a few locations missed for the dynamic project version. Also, re-wrote the releases dropdown code to not be driven by static list items code Updating documentation to have a simpler format for the different release versions, as well as updating some of the asciidoc files to add the project version at the top of the page. Also adding a simple documentation archive page to store the older versions of geowave as time goes on. Adding a few tweaks to the index page to remove some quickstart links. Also updating documentation files to try and make all internal document links relative and not static, so to preserve document versions from release to release. Also changing some file names to adhere to the overall naming convention. Modified geowave tools script (#1209) Signed-off-by: Srinivas Varala <srinivas.varala@gmail.com> Added REST services that leverage the CLI (#1207) * REST services added * Implemented parsers and other classes to make service compatible with swagger * Various rest fixes/implementations. Command and section changes * Added AddStore and AddIndex commands for the different types of stores/indexes. Various other small REST fixes/implementations * Improved RESTful practices and refactored code to make it more maintainable * fixed twitter serialization * locationtech ip fixes (#1189) * fixed minor issues with config commands * fixes for encrypted passwords * Fixed issues with converter handling and swaggerpaths. Continued to improve RESTful practices * Deployed Rest Server as a web application, implemented Oauth2 for Facebook * Removed mandatory Oauth, updated swaggerpaths * fixed fileupload and removed security * Improved upon responses and response codes for certain REST calls, minor bug fixes * findbugs fix * removed superfluous 'final' denotations * Fixed config file getters * gave set command a failure response * added validate line back in * deleted spi file * updated gitignores * fixed converter in setcommand * fixed bug and refactored geoserver commands * Reverted changes from non-serviceenabled config commands * reverted help command * added logging to set and AddIndexGroup commands * added getGeowaveContext * formatting and small replacements * geoserver fixes * set command and format fixes * took out binary Removed HADOOP_OPTS from geowave-tools.sh (#1211) Signed-off-by: Srinivas Varala <srinivas.varala@gmail.com> HP Fortify comments and fixes (#1213)

rfecher and others added 16 commits September 15, 2017 11:28

REST services added

189cd1f

Implemented parsers and other classes to make service compatible with…

42518f9

… swagger

Various rest fixes/implementations. Command and section changes

94b7f3b

Added AddStore and AddIndex commands for the different types of store…

9740b22

…s/indexes. Various other small REST fixes/implementations

Improved RESTful practices and refactored code to make it more mainta…

5e41eb6

…inable

fixed twitter serialization

3259b40

locationtech ip fixes (#1189)

81c0fc9

fixed minor issues with config commands

d1e3a22

fixes for encrypted passwords

b464bdc

Fixed issues with converter handling and swaggerpaths. Continued to i…

0e60e55

…mprove RESTful practices

Deployed Rest Server as a web application, implemented Oauth2 for Fac…

e78e8d3

…ebook

Removed mandatory Oauth, updated swaggerpaths

0c3ce29

fixed fileupload and removed security

86e3868

Improved upon responses and response codes for certain REST calls, mi…

1bb61fb

…nor bug fixes

Merge branch 'master' into final-rest-merge

2c5c970

findbugs fix

653ae3f

rfecher reviewed Oct 26, 2017

View reviewed changes

Comment thread .gitignore Outdated

docker-root

generated

.metadata

swagger.json

Copy link
Copy Markdown

Contributor

rfecher Oct 26, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's just take them out

rfecher reviewed Oct 26, 2017

View reviewed changes

emacthecav added 14 commits October 27, 2017 09:45

removed superfluous 'final' denotations

903efea

Fixed config file getters

df252f9

gave set command a failure response

056e96c

added validate line back in

e0031bb

deleted spi file

f2e7bf9

updated gitignores

be31bf2

fixed converter in setcommand

4f4f57f

fixed bug and refactored geoserver commands

87ae422

Reverted changes from non-serviceenabled config commands

539cff6

reverted help command

408ccf0

added logging to set and AddIndexGroup commands

d64a5cd

added getGeowaveContext

0360980

formatting and small replacements

46c44e2

geoserver fixes

c40fde4

rfecher reviewed Oct 30, 2017

View reviewed changes

emacthecav added 2 commits October 30, 2017 13:48

set command and format fixes

d7886d9

took out binary

b19f620

rfecher merged commit e75d8ea into master Oct 31, 2017

rfecher deleted the rest-project-0.9.6-final branch October 31, 2017 12:44

Conversation

emacthecav commented Oct 26, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rfecher Oct 26, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

rfecher Oct 26, 2017 •

edited

Loading