Merge pull request #40 from Axway/1.9-1

Grapes Server Version - 1.9 1

.gitignore

@@ -1,5 +1,165 @@
-.idea
-target
+
+# Created by https://www.gitignore.io/api/eclipse,intellij+iml,notepadpp,vim,java,maven
+
+### Eclipse ###
+
+.metadata
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+.recommenders
+
+# Eclipse Core
+.project
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# PyDev specific (Python IDE for Eclipse)
+*.pydevproject
+
+# CDT-specific (C/C++ Development Tooling)
+.cproject
+
+# JDT-specific (Eclipse Java Development Tools)
+.classpath
+
+# Java annotation processor (APT)
+.factorypath
+
+# PDT-specific (PHP Development Tools)
+.buildpath
+
+# sbteclipse plugin
+.target
+
+# Tern plugin
+.tern-project
+
+# TeXlipse plugin
+.texlipse
+
+# STS (Spring Tool Suite)
+.springBeans
+
+# Code Recommenders
+.recommenders/
+
+### Intellij+iml ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff:
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+
+# Sensitive or high-churn files:
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.xml
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+
+# Gradle:
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Mongo Explorer plugin:
+.idea/**/mongoSettings.xml
+
+## File-based project format:
+*.iws
+
+## Plugin-specific files:
+
+# IntelliJ
+/out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+### Intellij+iml Patch ###
+# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023
+
 *.iml
+modules.xml
+.idea/misc.xml
+*.ipr
+
+### Java ###
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+### Maven ###
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+release.properties
 dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
+
+# Exclude maven wrapper
+!/.mvn/wrapper/maven-wrapper.jar
+
+### NotepadPP ###
+# Notepad++ backups #
+
+### Vim ###
+# swap
+[._]*.s[a-v][a-z]
+[._]*.sw[a-p]
+[._]s[a-v][a-z]
+[._]sw[a-p]
+# session
+Session.vim
+# temporary
+.netrwhist
+*~
+# auto-generated tag files
+tags
+
+# End of https://www.gitignore.io/api/eclipse,intellij+iml,notepadpp,vim,java,maven
 jenkins/work

commons/pom.xml

@@ -10,9 +10,26 @@
 	<parent>
 		<groupId>org.axway.grapes</groupId>
 		<artifactId>grapes-parent</artifactId>
-        <version>1.4.4-SNAPSHOT</version>
+        <version>1.9.1-1-SNAPSHOT</version>
 	</parent>
-
+
+	<build>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-compiler-plugin</artifactId>
+					<version>3.1</version>
+					<configuration>
+						<source>1.7</source>
+						<target>1.7</target>
+						<optimize>true</optimize>
+						<showDeprecation>true</showDeprecation>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+	</build>
 	<dependencies>
         <dependency>
             <groupId>com.fasterxml.jackson.jaxrs</groupId>
@@ -31,5 +48,9 @@
 			<artifactId>junit</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+		</dependency>
 	</dependencies>
 </project>

commons/src/main/java/org/axway/grapes/commons/api/ServerAPI.java

@@ -9,7 +9,10 @@
  *
  * @author jdcoffre
  */
-public interface ServerAPI {
+public class ServerAPI {
+
+    private ServerAPI() {}
+
 
     //RESSOURCES
     /** Value - {@value}, Organization is a Grapes server resource that handles the information about organization.*/
@@ -27,12 +30,21 @@ public interface ServerAPI {
     /** Value - {@value}, License is a Grapes server resource that handles the information about license.*/
     public static final String LICENSE_RESOURCE = "license";
 
+    /** Value - {@value}, Report is a custom Grapes server report allowing dissemination of the stored information.*/
+    public static final String REPORT_RESOURCE = "report";
+
     /** Value - {@value}, Sequoia is a Grapes server provides graphs.*/
     public static final String SEQUOIA_RESOURCE = "sequoia";
 
     /** Value - {@value}, Webapp is an UI that is over Grapes server server REST API.*/
     public static final String WEBAPP_RESOURCE = "webapp";
 
+    /** Value = {@value}, Search is a Grapes server resource for searching modules and artifacts*/
+    public static final String SEARCH_RESOURCE = "search";
+
+    /** Value = {@value}, Search is a Grapes server resource for searching modules and artifacts*/
+    public static final String SEARCH_DOC_RESOURCE = "searchdoc";
+
     //METHODS
     /** Value - {@value}, GET methods that returns the deliveries of a product. Usually used as /product/{name}/<GET_DELIVERIES>.*/
     public static final String GET_DELIVERIES = "/deliveries";
@@ -84,13 +96,16 @@ public interface ServerAPI {
 
     /** Value - {@value}, GET methods a report of regarding the promotion or the dependencies. Usually used as /resourceName/{resourceUID}<GET_DEPENDENCIES><GET_DEPENDENCIES_REPORT>.*/
     public static final String GET_REPORT = "/report";
-
+    
     /** Value - {@value}, GET methods that returns the licenses of the targeted resource. Usually used as /resourceName/{resourceUID}<GET_LICENSES>.*/
     public static final String GET_LICENSES = "/licenses";
 
     /** Value - {@value}, GET methods that returns the organization of an Artifact or a Module.*/
     public static final String GET_ORGANIZATION = "/organization";
 
+    /** Value - {@value}, GET methods that returns the list of available reports.*/
+    public static final String GET_REPORTS = "/reports";
+
     /** Value - {@value}, POST/GET flag "DO_NOT_USE" for the targeted artifact. Usually used as /<ARTIFACT_RESOURCE>/{gavc}/<SET_DO_NOT_USE>?<DO_NOT_USE>=<Boolean></></>.*/
     public static final String SET_DO_NOT_USE = "/donotuse";
 
@@ -152,6 +167,9 @@ public interface ServerAPI {
     /** Value - {@value}, boolean query parameter used to show the license long names in reports.*/
     public static final String SHOW_LICENSE_FULL_NAME_PARAM = "showLicenseFullNames";
 
+    /** Value - {@value}, boolean query parameter used to exclude the VERSION_IS_SNAPSHOT validation from the promotion report.*/
+    public static final String EXCLUDE_SNAPSHOT_PARAM = "excludeSNAPSHOT";
+
     /** Value - {@value}, boolean query parameter used to show the sizes in reports.*/
     public static final String SHOW_SIZE = "showSize";
 
@@ -200,6 +218,9 @@ public interface ServerAPI {
     /** Value - {@value}, String query parameter used to filter artifacts.*/
     public static final String EXTENSION_PARAM = "extension";
 
+    /** Value - {@value}, String query parameter used to filter artifacts.*/
+    public static final String ORIGIN_PARAM = "origin";
+
     /** Value - {@value}, String query parameter used to add credentials.*/
     public static final String USER_PARAM = "user";
 
@@ -220,4 +241,10 @@ public interface ServerAPI {
 
     /** Value - {@value}, String query parameter used to filter artifacts.*/
     public static final String PROVIDER_PARAM = "provider";
+
+    /** Value - {@value}, String query parameter used to filter modules while searching.*/
+    public static final String MODULES_PARAM = "modules";
+
+    /** Value - {@value}, String query parameter used to filter artifacts while searching.*/
+    public static final String ARTIFACTS_PARAM = "artifacts";
 }