Merge remote-tracking branch 'remotes/origin/servCallRefact'

Author: dtheiler

adapter/adapter.rest/adapter.rest.v1/src/main/java/at/kc/tugraz/ss/adapter/rest/v1/SSRestMainV1.java

@@ -66,7 +66,7 @@ public SSRestMainV1() throws Exception{
     resourceConfig = new ResourceConfig(SSAdapterRESTFileReplace.class);
     resourceConfig.register(MultiPartFeature.class);
 
-    SSAdapterRestConf.instSet (SSFileU.dirCatalinaBase() + SSVocConf.dirNameConf + "sss.adapter.rest.v1.conf.alpha.yaml");
+    SSAdapterRestConf.instSet (SSFileU.dirCatalinaBase() + SSVocConf.dirNameConf + "sss.adapter.rest.v1.conf.test.yaml");
 
     SSFileExtE.init    ();
     SSMimeTypeE.init   ();

adapter/adapter.rest/adapter.rest.v2/src/main/java/at/kc/tugraz/ss/adapter/rest/v2/SSRestMainV2.java

@@ -49,7 +49,7 @@ public class SSRestMainV2 extends Application {
 
   public SSRestMainV2() throws Exception{
 
-    SSAdapterRestConf.instSet (SSFileU.dirCatalinaBase() + SSVocConf.dirNameConf + "sss.adapter.rest.v2.conf.alpha.yaml");
+    SSAdapterRestConf.instSet (SSFileU.dirCatalinaBase() + SSVocConf.dirNameConf + "sss.adapter.rest.v2.conf.test.yaml");
 
     conf = SSAdapterRestConf.instGet();
 

adapter/adapter.rest/adapter.rest.v2/src/main/java/at/kc/tugraz/ss/adapter/rest/v2/pars/category/SSRESTCategories.java

@@ -23,8 +23,8 @@
 import at.kc.tugraz.ss.adapter.rest.v2.SSRestMainV2;
 import at.kc.tugraz.ss.category.datatypes.par.SSCategoriesPredefinedGetPar;
 import at.kc.tugraz.ss.category.datatypes.ret.SSCategoriesPredefinedGetRet;
-import at.kc.tugraz.ss.service.tag.datatypes.pars.SSTagsUserGetPar;
-import at.kc.tugraz.ss.service.tag.datatypes.ret.SSTagsUserGetRet;
+import at.kc.tugraz.ss.service.tag.datatypes.pars.SSTagsGetPar;
+import at.kc.tugraz.ss.service.tag.datatypes.ret.SSTagsGetRet;
 import at.tugraz.sss.serv.SSServOpE;
 import com.wordnik.swagger.annotations.Api;
 import com.wordnik.swagger.annotations.ApiOperation;

adapter/adapter.rest/adapter.rest.v2/src/main/java/at/kc/tugraz/ss/adapter/rest/v2/pars/circle/SSRESTCircles.java

@@ -232,7 +232,8 @@ public Response entitiesGet(
           null,  //forUser
           SSEntityE.asListWithoutNullAndEmpty(), //types
           true,  //withSystemCircles
-          true); //invokeEntityHandlers
+          true, //invokeEntityHandlers
+          true); //withUserRestriction
 
     }catch(Exception error){
       return Response.status(422).build();
@@ -268,6 +269,7 @@ public Response circleUsersAdd(
           SSUri.get(circle, SSVocConf.sssUri), //circle
           input.users,  //users
           true, //withUserRestriction
+          true, //invokeEntityHandlers
           true); //shouldCommit
 
     }catch(Exception error){

adapter/adapter.rest/adapter.rest.v2/src/main/java/at/kc/tugraz/ss/adapter/rest/v2/pars/disc/SSDiscEntryAddRESTAPIV2Par.java

@@ -42,8 +42,8 @@ public class SSDiscEntryAddRESTAPIV2Par{
   public SSLabel                label          = null;
 
   @XmlElement
-  public void setLabel(final String label){
-    try{ this.label = SSLabel.get(label); } catch(Exception error){}
+  public void setLabel(final String label) throws Exception{
+    this.label = SSLabel.get(label); 
   }
 
   @ApiModelProperty(
@@ -52,8 +52,8 @@ public void setLabel(final String label){
   public SSTextComment          description    = null;
 
   @XmlElement
-  public void setDescription(final String description){
-    try{ this.description = SSTextComment.get(description); } catch(Exception error){}
+  public void setDescription(final String description) throws Exception{
+    this.description = SSTextComment.get(description);
   }
 
   @ApiModelProperty(
@@ -63,17 +63,27 @@ public void setDescription(final String description){
 
   @XmlElement
   public void setEntities(final List<String> entities) throws Exception{
-    try{ this.entities = SSUri.get(entities, SSVocConf.sssUri); } catch(Exception error){}
+    this.entities = SSUri.get(entities, SSVocConf.sssUri);
   }
 
+  @ApiModelProperty(
+    required = false,
+    value = "labels for the entities to be attached")
+  public List<SSLabel>            entityLabels       = new ArrayList<>();
+  
+  @XmlElement
+  public void setEntityLabels(final List<String> entityLabels) throws Exception{
+   this.entityLabels = SSLabel.get(entityLabels);
+  }
+
   @ApiModelProperty(
     required = false,
     value = "users to share this discussion with upon creation of a new discussion (optional, though works only for a new discussion)")
   public List<SSUri>            users          = new ArrayList<>();
 
   @XmlElement
   public void setUsers(final List<String> users) throws Exception{
-    try{ this.users = SSUri.get(users, SSVocConf.sssUri); } catch(Exception error){}
+    this.users = SSUri.get(users, SSVocConf.sssUri);
   }
 
   @ApiModelProperty(
@@ -83,7 +93,7 @@ public void setUsers(final List<String> users) throws Exception{
 
   @XmlElement
   public void setCircles(final List<String> circles) throws Exception{
-    try{ this.circles = SSUri.get(circles, SSVocConf.sssUri); } catch(Exception error){}
+    this.circles = SSUri.get(circles, SSVocConf.sssUri);
   }
 
   @ApiModelProperty(
@@ -92,8 +102,8 @@ public void setCircles(final List<String> circles) throws Exception{
   public SSTextComment          entry    = null;
 
   @XmlElement
-  public void setEntry(final String entry){
-    try{ this.entry = SSTextComment.get(entry); }catch(Exception error){}
+  public void setEntry(final String entry) throws Exception{
+    this.entry = SSTextComment.get(entry);
   }
 
   @ApiModelProperty(
@@ -102,8 +112,8 @@ public void setEntry(final String entry){
   public SSUri                disc          = null;
 
   @XmlElement
-  public void setDisc(final String disc){
-    try{ this.disc = SSUri.get(disc, SSVocConf.sssUri); } catch(Exception error){}
+  public void setDisc(final String disc) throws Exception{
+    this.disc = SSUri.get(disc, SSVocConf.sssUri);
   }
 
   @ApiModelProperty(
@@ -112,8 +122,8 @@ public void setDisc(final String disc){
   public SSUri                entity          = null;
 
   @XmlElement
-  public void setEntity(final String entity){
-    try{ this.entity = SSUri.get(entity, SSVocConf.sssUri); } catch(Exception error){}
+  public void setEntity(final String entity) throws Exception{
+    this.entity = SSUri.get(entity, SSVocConf.sssUri);
   }
 
   @ApiModelProperty(
@@ -122,8 +132,8 @@ public void setEntity(final String entity){
   public SSEntityE                type          = null;
 
   @XmlElement
-  public void setType(final String type){
-    try{ this.type = SSEntityE.get(type); } catch(Exception error){}
+  public void setType(final String type) throws Exception{
+    this.type = SSEntityE.get(type);
   }
 
   @XmlElement

adapter/adapter.rest/adapter.rest.v2/src/main/java/at/kc/tugraz/ss/adapter/rest/v2/pars/disc/SSRESTDiscs.java

@@ -22,14 +22,14 @@
 
 import at.kc.tugraz.ss.adapter.rest.v2.SSRestMainV2;
 import at.kc.tugraz.ss.serv.voc.conf.SSVocConf;
-import at.kc.tugraz.ss.service.disc.datatypes.pars.SSDiscUserDiscURIsForTargetGetPar;
-import at.kc.tugraz.ss.service.disc.datatypes.pars.SSDiscUserEntryAddPar;
-import at.kc.tugraz.ss.service.disc.datatypes.pars.SSDiscUserWithEntriesGetPar;
-import at.kc.tugraz.ss.service.disc.datatypes.pars.SSDiscsUserAllGetPar;
-import at.kc.tugraz.ss.service.disc.datatypes.ret.SSDiscUserDiscURIsForTargetGetRet;
-import at.kc.tugraz.ss.service.disc.datatypes.ret.SSDiscUserEntryAddRet;
-import at.kc.tugraz.ss.service.disc.datatypes.ret.SSDiscUserWithEntriesRet;
-import at.kc.tugraz.ss.service.disc.datatypes.ret.SSDiscsUserAllGetRet;
+import at.kc.tugraz.ss.service.disc.datatypes.pars.SSDiscURIsForTargetGetPar;
+import at.kc.tugraz.ss.service.disc.datatypes.pars.SSDiscEntryAddPar;
+import at.kc.tugraz.ss.service.disc.datatypes.pars.SSDiscWithEntriesGetPar;
+import at.kc.tugraz.ss.service.disc.datatypes.pars.SSDiscsAllGetPar;
+import at.kc.tugraz.ss.service.disc.datatypes.ret.SSDiscURIsForTargetGetRet;
+import at.kc.tugraz.ss.service.disc.datatypes.ret.SSDiscEntryAddRet;
+import at.kc.tugraz.ss.service.disc.datatypes.ret.SSDiscWithEntriesRet;
+import at.kc.tugraz.ss.service.disc.datatypes.ret.SSDiscsAllGetRet;
 import at.tugraz.sss.serv.SSServOpE;
 import at.tugraz.sss.serv.SSUri;
 import at.tugraz.sss.serv.SSVarNames;
@@ -56,17 +56,17 @@ public class SSRESTDiscs{
   @Path("")
   @ApiOperation(
     value = "retrieve all discussions",
-    response = SSDiscsUserAllGetRet.class)
+    response = SSDiscsAllGetRet.class)
   public Response discsGet(
     @Context 
       final HttpHeaders headers){
 
-    final SSDiscsUserAllGetPar par;
+    final SSDiscsAllGetPar par;
 
     try{
 
       par =
-        new SSDiscsUserAllGetPar(
+        new SSDiscsAllGetPar(
           SSServOpE.discsAllGet,
           null,
           null);
@@ -84,19 +84,19 @@ public Response discsGet(
   @Path("")
   @ApiOperation(
     value = "add a textual comment/answer/opinion to a discussion [for given entity] or create a new discussion",
-    response = SSDiscUserEntryAddRet.class)
+    response = SSDiscEntryAddRet.class)
   public Response circleCreate(
     @Context 
       final HttpHeaders headers,
 
     final SSDiscEntryAddRESTAPIV2Par input){
 
-    final SSDiscUserEntryAddPar par;
+    final SSDiscEntryAddPar par;
 
     try{
 
       par =
-        new SSDiscUserEntryAddPar(
+        new SSDiscEntryAddPar(
           SSServOpE.discEntryAdd,
           null,
           null,
@@ -110,6 +110,7 @@ public Response circleCreate(
           input.users, //users
           input.circles, //circles
           input.entities, //entities
+          input.entityLabels, //entityLabels
           true); //shouldCommit
 
     }catch(Exception error){
@@ -125,7 +126,7 @@ public Response circleCreate(
   @Path("/{disc}")
   @ApiOperation(
     value = "retrieve a discussion with its entries",
-    response = SSDiscUserWithEntriesRet.class)
+    response = SSDiscWithEntriesRet.class)
   public Response circleGet(
     @Context                    
       final HttpHeaders  headers,
@@ -135,12 +136,12 @@ public Response circleGet(
 
     final SSDiscGetRESTAPIV2Par input){
 
-    final SSDiscUserWithEntriesGetPar par;
+    final SSDiscWithEntriesGetPar par;
 
     try{
 
       par =
-        new SSDiscUserWithEntriesGetPar(
+        new SSDiscWithEntriesGetPar(
           SSServOpE.discWithEntriesGet, //op
           null, //key
           null, //user
@@ -161,21 +162,21 @@ public Response circleGet(
   @Path("/entities/{entity}")
   @ApiOperation(
     value = "retrieve discussions for a certain entity",
-    response = SSDiscUserDiscURIsForTargetGetRet.class)
+    response = SSDiscURIsForTargetGetRet.class)
   public Response discURIsForTargetGet(
     @Context                    
       final HttpHeaders  headers,
 
     @PathParam (SSVarNames.entity)  
       final String entity){
 
-    final SSDiscUserDiscURIsForTargetGetPar par;
+    final SSDiscURIsForTargetGetPar par;
 
     try{
 
       par =
-        new SSDiscUserDiscURIsForTargetGetPar(
-          SSServOpE.discUserDiscURIsForTargetGet, //op
+        new SSDiscURIsForTargetGetPar(
+          SSServOpE.discURIsForTargetGet, //op
           null, //key
           null, //user
           SSUri.get(entity, SSVocConf.sssUri)); //entity

adapter/adapter.rest/adapter.rest.v2/src/main/java/at/kc/tugraz/ss/adapter/rest/v2/pars/search/SSRESTSearch.java

@@ -65,6 +65,8 @@ public Response search(
           input.wordsToSearchFor,
           input.includeTags,
           input.tagsToSearchFor,
+          input.includeAuthors,
+          input.authorsToSearchFor,
           input.includeLabel,
           input.labelsToSearchFor,
           input.includeDescription,

adapter/adapter.rest/adapter.rest.v2/src/main/java/at/kc/tugraz/ss/adapter/rest/v2/pars/search/SSSearchRESTAPIV2Par.java

@@ -59,6 +59,22 @@ public class SSSearchRESTAPIV2Par{
     value = "tags to be searched for" )
   public List<String>        tagsToSearchFor            = null;
 
+  @XmlElement
+  @ApiModelProperty( 
+    required = false, 
+    value = "whether authors of entities should be looked to find entities" )
+  public Boolean             includeAuthors                = null;
+  
+  @ApiModelProperty( 
+    required = false, 
+    value = "authors to be searched for" )
+  public List<SSUri>        authorsToSearchFor            = null;
+  
+  @XmlElement
+  public void setAuthorsToSearchFor(final List<String> authorsToSearchFor) throws Exception{
+    this.authorsToSearchFor = SSUri.get(authorsToSearchFor);
+  }
+  
   @XmlElement
   @ApiModelProperty(
     required = false,