Skip to content

Commit fc853b4

Browse files
dtheilerdtheiler
committed
SSS-155
1 parent 4a24df7 commit fc853b4

File tree

42 files changed

+156
-91
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+156
-91
lines changed

‎serv/serv.db/serv.db.api/src/main/java/at/tugraz/sss/serv/SSDBSQLFct.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,19 @@ protected static List<SSUri> getURIsFromResult(
346346
return uris;
347347
}
348348

349+
protected static SSAuthor bindingStrToAuthor(
350+
final ResultSet resultSet,
351+
final String binding) throws Exception{
352+
353+
final String tmp = bindingStr(resultSet, binding);
354+
355+
if(SSStrU.isEmpty(tmp)){
356+
return null;
357+
}
358+
359+
return SSAuthor.get(SSUri.get(tmp));
360+
}
361+
349362
protected static SSUri bindingStrToUri(
350363
final ResultSet resultSet,
351364
final String binding) throws Exception{

‎serv/serv.entities/src/main/java/at/tugraz/sss/serv/SSAuthor.java‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
/**
2+
* Code contributed to the Learning Layers project
3+
* http://www.learning-layers.eu
4+
* Development is partly funded by the FP7 Programme of the European Commission under
5+
* Grant Agreement FP7-ICT-318209.
6+
* Copyright (c) 2015, Graz University of Technology - KTI (Knowledge Technologies Institute).
7+
* For a list of contributors see the AUTHORS file at the top-level directory of this distribution.
8+
*
9+
* Licensed under the Apache License, Version 2.0 (the "License");
10+
* you may not use this file except in compliance with the License.
11+
* You may obtain a copy of the License at
12+
*
13+
* http://www.apache.org/licenses/LICENSE-2.0
14+
*
15+
* Unless required by applicable law or agreed to in writing, software
16+
* distributed under the License is distributed on an "AS IS" BASIS,
17+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18+
* See the License for the specific language governing permissions and
19+
* limitations under the License.
20+
*/
21+
package at.tugraz.sss.serv;
22+
23+
import java.util.Map;
24+
25+
public class SSAuthor extends SSEntity{
26+
27+
public static SSAuthor get(
28+
final SSAuthor author,
29+
final SSEntity entity) throws Exception{
30+
31+
return new SSAuthor(author, entity);
32+
}
33+
34+
protected SSAuthor(
35+
final SSAuthor author,
36+
final SSEntity entity) throws Exception{
37+
38+
super(entity);
39+
}
40+
41+
public static SSAuthor get(
42+
final SSUri id,
43+
final SSLabel label) throws Exception{
44+
45+
return new SSAuthor(id, label);
46+
}
47+
48+
public static SSAuthor get(
49+
final SSUri id) throws Exception{
50+
51+
return new SSAuthor(id);
52+
}
53+
54+
protected SSAuthor(
55+
final SSUri id,
56+
final SSLabel label) throws Exception{
57+
58+
super(id, SSEntityE.user, label);
59+
}
60+
61+
protected SSAuthor(
62+
final SSUri id) throws Exception{
63+
64+
super(id, SSEntityE.user);
65+
}
66+
67+
@Override
68+
public Object jsonLDDesc(){
69+
70+
final Map<String, Object> ld = (Map<String, Object>) super.jsonLDDesc();
71+
72+
return ld;
73+
}
74+
}

‎serv/serv.entities/src/main/java/at/tugraz/sss/serv/SSEntity.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@
2020
*/
2121
package at.tugraz.sss.serv;
2222

23-
import at.tugraz.sss.serv.SSJSONLDU;
24-
import at.tugraz.sss.serv.SSStrU;
25-
import at.tugraz.sss.serv.SSVarNames;
2623
import com.wordnik.swagger.annotations.ApiModelProperty;
2724
import java.util.ArrayList;
2825
import java.util.HashMap;
@@ -54,7 +51,7 @@ public class SSEntity extends SSEntityA{
5451
@ApiModelProperty(
5552
required = false,
5653
value = "creator")
57-
public SSUri author = null;
54+
public SSAuthor author = null;
5855

5956
@ApiModelProperty(
6057
required = false,
@@ -248,7 +245,7 @@ public Object jsonLDDesc() {
248245
ld.put(SSVarNames.label, SSVarNames.sss + SSStrU.colon + SSLabel.class.getName());
249246
ld.put(SSVarNames.creationTime, SSVarNames.xsd + SSStrU.colon + SSStrU.valueLong);
250247
ld.put(SSVarNames.type, SSVarNames.sss + SSStrU.colon + SSEntityE.class.getName());
251-
ld.put(SSVarNames.author, SSVarNames.sss + SSStrU.colon + SSUri.class.getName());
248+
ld.put(SSVarNames.author, SSVarNames.sss + SSStrU.colon + SSAuthor.class.getName());
252249
ld.put(SSVarNames.description, SSVarNames.sss + SSStrU.colon + SSTextComment.class.getName());
253250
ld.put(SSVarNames.overallRating, SSVarNames.sss + SSStrU.colon + SSEntityA.class.getName());
254251
ld.put(SSVarNames.thumb, SSVarNames.xsd + SSStrU.colon + SSStrU.valueString);
@@ -337,8 +334,8 @@ public SSEntityE getType(){
337334
return type;
338335
}
339336

340-
public String getAuthor() throws Exception{
341-
return SSStrU.removeTrailingSlash(author);
337+
public SSAuthor getAuthor() throws Exception{
338+
return author;
342339
}
343340

344341
public String getDescription() throws Exception{

‎serv/serv.entities/src/main/java/at/tugraz/sss/serv/SSUri.java‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,6 @@
2020
*/
2121
package at.tugraz.sss.serv;
2222

23-
import at.tugraz.sss.serv.SSEncodingU;
24-
import at.tugraz.sss.serv.SSEncodingU;
25-
import at.tugraz.sss.serv.SSEntityA;
26-
import at.tugraz.sss.serv.SSEntityA;
27-
import at.tugraz.sss.serv.SSLinkU;
28-
import at.tugraz.sss.serv.SSLinkU;
29-
import at.tugraz.sss.serv.SSLogU;
30-
import at.tugraz.sss.serv.SSLogU;
31-
import at.tugraz.sss.serv.SSObjU;
32-
import at.tugraz.sss.serv.SSObjU;
33-
import at.tugraz.sss.serv.SSStrU;
34-
import at.tugraz.sss.serv.SSStrU;
3523
import java.net.URL;
3624
import java.net.URLEncoder;
3725
import java.util.*;

‎serv/serv.reg/src/main/java/at/tugraz/sss/serv/SSServReg.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,6 +462,6 @@ private void regServOps(
462462
// if(servImpl instanceof SSServImplWithDBA){
463463
//
464464
// if(((SSServImplWithDBA)servImpl).dbSQL.getActive() > ((SSServImplWithDBA)servImpl).dbSQL.getMaxActive() - 30){
465-
// throw new SSErr(SSErrE.maxNumDBConsReached);
465+
// SSServErrReg.regErrThrow(new SSErr(SSErrE.maxNumDBConsReached);
466466
// }
467467
// }

‎servs/activity/activity.impl/src/main/java/at/kc/tugraz/ss/activity/impl/fct/sql/SSActivitySQLFct.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@
2626
import at.kc.tugraz.ss.activity.datatypes.SSActivityContent;
2727
import at.kc.tugraz.ss.activity.datatypes.enums.SSActivityContentE;
2828
import at.kc.tugraz.ss.activity.datatypes.enums.SSActivityE;
29+
import at.tugraz.sss.serv.SSAuthor;
2930
import at.tugraz.sss.serv.SSEntity;
3031
import at.tugraz.sss.serv.SSTextComment;
3132
import at.tugraz.sss.serv.SSUri;
3233
import at.tugraz.sss.serv.SSEntityE;
3334
import at.tugraz.sss.serv.SSDBSQLFct;
3435
import at.tugraz.sss.serv.SSDBSQLI;
3536
import at.tugraz.sss.serv.SSServErrReg;
36-
3737
import java.sql.ResultSet;
3838
import java.util.ArrayList;
3939
import java.util.HashMap;
@@ -283,15 +283,15 @@ public List<SSActivity> getActivities(
283283

284284
final List<String> latestActivities = new ArrayList<>();
285285
SSUri entity;
286-
SSUri author;
286+
SSAuthor author;
287287
SSActivityE type;
288288
String activityCombi;
289289

290290
while(resultSet.next()){
291291

292-
author = bindingStrToUri (resultSet, SSSQLVarNames.author);
293-
entity = bindingStrToUri (resultSet, SSSQLVarNames.entityId);
294-
type = SSActivityE.get (bindingStr(resultSet, SSSQLVarNames.activityType));
292+
author = bindingStrToAuthor (resultSet, SSSQLVarNames.author);
293+
entity = bindingStrToUri (resultSet, SSSQLVarNames.entityId);
294+
type = SSActivityE.get (bindingStr(resultSet, SSSQLVarNames.activityType));
295295

296296
if(
297297
includeOnlyLastActivities &&
@@ -317,14 +317,14 @@ public List<SSActivity> getActivities(
317317
}
318318

319319
activityObj =
320-
SSActivity.get(bindingStrToUri (resultSet, SSSQLVarNames.id),
320+
SSActivity.get(
321+
bindingStrToUri (resultSet, SSSQLVarNames.id),
321322
type,
322323
activityEntity,
323324
new ArrayList<>());
324325

325326
activityObj.creationTime = bindingStrToLong (resultSet, SSSQLVarNames.creationTime);
326327
activityObj.author = author;
327-
328328
activityObj.comments.addAll(SSTextComment.asListWithoutNullAndEmpty(SSTextComment.get(bindingStr(resultSet, SSSQLVarNames.textComment))));
329329

330330
activities.add(activityObj);
@@ -431,8 +431,8 @@ public SSActivity getActivity(final SSUri activity) throws Exception{
431431
null,
432432
new ArrayList<>());
433433

434-
activityObj.author = bindingStrToUri (resultSet, SSSQLVarNames.author);
435-
activityObj.creationTime = bindingStrToLong (resultSet, SSSQLVarNames.creationTime);
434+
activityObj.author = bindingStrToAuthor (resultSet, SSSQLVarNames.author);
435+
activityObj.creationTime = bindingStrToLong (resultSet, SSSQLVarNames.creationTime);
436436

437437
entity = bindingStrToUri (resultSet, SSSQLVarNames.entityId);
438438

‎servs/coll/coll.impl/src/main/java/at/kc/tugraz/ss/service/coll/impl/fct/sql/SSCollSQLFct.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ public List<SSColl> getCollsPublic() throws Exception{
295295
SSColl.get(bindingStrToUri (resultSet, SSSQLVarNames.id),
296296
bindingStrToLabel (resultSet, SSSQLVarNames.label));
297297

298-
collObj.author = bindingStrToUri (resultSet, SSSQLVarNames.author);
298+
collObj.author = bindingStrToAuthor (resultSet, SSSQLVarNames.author);
299299

300300
publicColls.add(collObj);
301301
}
@@ -635,7 +635,7 @@ private SSColl getColl(
635635
SSColl.get(collUri,
636636
bindingStrToLabel (resultSet, SSSQLVarNames.label));
637637

638-
collObj.author = bindingStrToUri (resultSet, SSSQLVarNames.author);
638+
collObj.author = bindingStrToAuthor (resultSet, SSSQLVarNames.author);
639639

640640
collObj.circleTypes.addAll(circleTypes);
641641

‎servs/disc/disc.impl/src/main/java/at/kc/tugraz/ss/service/disc/impl/fct/sql/SSDiscSQLFct.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -368,9 +368,9 @@ public SSDisc getDiscWithoutEntries(
368368
bindingStrToLabel (resultSet, SSSQLVarNames.label),
369369
bindingStrToUri (resultSet, SSSQLVarNames.entityId));
370370

371-
discObj.author = bindingStrToUri (resultSet, SSSQLVarNames.author);
372-
discObj.creationTime = bindingStrToLong (resultSet, SSSQLVarNames.creationTime);
373-
discObj.description = bindingStrToTextComment(resultSet, SSSQLVarNames.description);
371+
discObj.author = bindingStrToAuthor (resultSet, SSSQLVarNames.author);
372+
discObj.creationTime = bindingStrToLong (resultSet, SSSQLVarNames.creationTime);
373+
discObj.description = bindingStrToTextComment (resultSet, SSSQLVarNames.description);
374374

375375
return discObj;
376376

@@ -478,7 +478,7 @@ public SSDisc getDiscWithEntries(
478478
bindingStrToTextComment (resultSet, SSSQLVarNames.discEntryContent));
479479

480480
discEntryObj.creationTime = bindingStrToLong (resultSet, SSSQLVarNames.creationTime);
481-
discEntryObj.author = bindingStrToUri (resultSet, SSSQLVarNames.author);
481+
discEntryObj.author = bindingStrToAuthor (resultSet, SSSQLVarNames.author);
482482

483483
discEntries.add(discEntryObj);
484484
}

‎servs/entity/entity.datatypes/src/main/java/at/kc/tugraz/ss/serv/datatypes/entity/datatypes/par/SSEntitiesForDescriptionsGetPar.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public SSEntitiesForDescriptionsGetPar(SSServPar par) throws Exception{
4747
}
4848

4949
}catch(Exception error){
50-
throw new SSErr(SSErrE.servParCreationFailed);
50+
SSServErrReg.regErrThrow(new SSErr(SSErrE.servParCreationFailed));
5151
}
5252
}
5353
}

‎servs/entity/entity.datatypes/src/main/java/at/kc/tugraz/ss/serv/datatypes/entity/datatypes/par/SSEntitiesForLabelsAndDescriptionsGetPar.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public SSEntitiesForLabelsAndDescriptionsGetPar(SSServPar par) throws Exception{
4747
}
4848

4949
}catch(Exception error){
50-
throw new SSErr(SSErrE.servParCreationFailed);
50+
SSServErrReg.regErrThrow(new SSErr(SSErrE.servParCreationFailed));
5151
}
5252
}
5353
}

0 commit comments

Comments
 (0)