Merge branch 'master' into account

Fork: 0

nitta-lab-2023 / NemophilaServer

Browse code Merge branch 'master' into account_login # Conflicts: # src/main/java/org/ntlab/nemophila/resources/accounts/AccountRest.java 2023/12/21 Accountmanager3 Fix FriendManager ShopManagerTest ShopPostRest ShopRest ShopRestBrabch account1 accountspostrest addDate fixLoginRest fixParameter frinedsRest id master postcount shopsRest ...shopsRestFix
commit 0610dc8e086646feb64544162767f71a1f71373f 2 parents 073ae4f + 32f77a1 r-nishimura authored on 11 May 2023

Patch

Unified Split

Showing 8 changed files

Ignore Space Show notes View

■■■■■

src/main/java/org/ntlab/nemophila/models/accounts/Account.java 0 → 100644

Ignore Space Show notes View

■■■■■

src/main/java/org/ntlab/nemophila/models/accounts/AccountManager.java 0 → 100644

Ignore Space Show notes View

■■■■■

src/main/java/org/ntlab/nemophila/models/accounts/Post.java 0 → 100644

                Ignore Space
               Show notes
              View
            
          
          6 ■■■■■
          src/main/java/org/ntlab/nemophila/models/shops/Shop.java
        
        
        
          0 → 100644
             package org.ntlab.nemophila.models.shops;
 
public class Shop {
    
}
+package org.ntlab.nemophila.models.shops;
+public class Shop {
+}

                Ignore Space
               Show notes
              View
            
          
          1 ■■■■■
          src/main/java/org/ntlab/nemophila/resources/accounts/AccountPostsRest.java
 import javax.ws.rs.PathParam;
 
@Component
@Path("/accounts")
 
public class AccountPostsRest {
    @GET
    @Path("/{uid}/posts")
    public String getAccountPosts(@PathParam("uid") String uid){
 import javax.ws.rs.PathParam;
 @Component
 @Path("/accounts")
 public class AccountPostsRest {
     @GET
     @Path("/{uid}/posts")
     public String getAccountPosts(@PathParam("uid") String uid){

                Ignore Space
               Show notes
              View
            
          
          8 ■■■■■
          src/main/java/org/ntlab/nemophila/resources/accounts/FriendsRest.java
             package org.ntlab.nemophila.resources.accounts;
 
import org.springframework.stereotype.Component;
 
import javax.websocket.server.PathParam;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
 
@Component
@Path("/accounts")
public class FriendsRest {
    @GET
    public String getAccounts() {
        return null;
    @Path("/{uid}/friends")
    public String getFriends(@PathParam("uid") String uid){
        return "Hello World";
    }
}
 package org.ntlab.nemophila.resources.accounts;
 import org.springframework.stereotype.Component;
-import javax.websocket.server.PathParam;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
 @Component
 @Path("/accounts")
 public class FriendsRest {
     @GET
+    public String getAccounts() {
+        return null;
+    @Path("/{uid}/friends")
+    public String getFriends(@PathParam("uid") String uid){
+        return "Hello World";
     }
 }

                Ignore Space
               Show notes
              View
            
          
          19 ■■■■■
          src/main/java/org/ntlab/nemophila/resources/accounts/RequestingRest.java
        
        
        
          0 → 100644
             package org.ntlab.nemophila.resources.accounts;
 
import org.springframework.stereotype.Component;
 
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
 
@Component
@Path("/accounts")
public class RequestingRest {
    @GET
    @Path("/{uid}/requesting")
    public String getRequesting(@PathParam("uid") String uid) {
 
        return null;
    }
}
+package org.ntlab.nemophila.resources.accounts;
+import org.springframework.stereotype.Component;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+@Component
+@Path("/accounts")
+public class RequestingRest {
+    @GET
+    @Path("/{uid}/requesting")
+    public String getRequesting(@PathParam("uid") String uid) {
+        return null;
+    }
+}

                Ignore Space
               Show notes
              View
            
          
          17 ■■■■■
          src/main/java/org/ntlab/nemophila/resources/shops/ShopPostsRest.java
        
        
        
          0 → 100644
             package org.ntlab.nemophila.resources.shops;
 
import org.springframework.stereotype.Component;
 
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
 
@Component
@Path("/shops")
public class ShopPostsRest {
    @GET
    @Path("/{sid}/posts")
    public String getAccount(@PathParam("sid") String sid) {
        return null;
    }
}
+package org.ntlab.nemophila.resources.shops;
+import org.springframework.stereotype.Component;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+@Component
+@Path("/shops")
+public class ShopPostsRest {
+    @GET
+    @Path("/{sid}/posts")
+    public String getAccount(@PathParam("sid") String sid) {
+        return null;
+    }
+}

Show line notes below